Remove EPM:all_hosts_ and use all_extension_views_ instead.

chrome/browser/extensions/extension_devtools_browsertests.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/ref_counted.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_devtools_browsertest.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_util.h"
 
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::DevToolsClientHost;
 using content::DevToolsManager;
 using content::WebContents;
 
-// Looks for an ExtensionHost whose URL has the given path component (including
-// leading slash).  Also verifies that the expected number of hosts are loaded.
-static ExtensionHost* FindHostWithPath(ExtensionProcessManager* manager,
-                                       const std::string& path,
-                                       int expected_hosts) {
+// Looks for an background ExtensionHost whose URL has the given path component

[Charlie Reis, 2012/04/25 00:04:13]

nit: a background

+// (including leading slash).  Also verifies that the expected number of hosts
+// are loaded.
+static ExtensionHost* FindBackgroundHostWithPath(
+    ExtensionProcessManager* manager,
+    const std::string& path,
+    int expected_hosts) {
   ExtensionHost* host = NULL;
   int num_hosts = 0;
-  for (ExtensionProcessManager::const_iterator iter = manager->begin();
-       iter != manager->end(); ++iter) {
+  ExtensionProcessManager::ExtensionHostSet background_hosts =
+      manager->background_hosts();
+  for (ExtensionProcessManager::const_iterator iter = background_hosts.begin();
+       iter != background_hosts.end(); ++iter) {
     if ((*iter)->GetURL().path() == path) {
       EXPECT_FALSE(host);
       host = *iter;
     }
     num_hosts++;
   }
   EXPECT_EQ(expected_hosts, num_hosts);
   EXPECT_TRUE(host);
   return host;
 }
 
 // Tests for the experimental timeline extensions API.
 IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, TimelineApi) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("devtools").AppendASCII("timeline_api")));
 
   // Get the ExtensionHost that is hosting our background page.
   ExtensionProcessManager* manager =
       browser()->profile()->GetExtensionProcessManager();
-  ExtensionHost* host = FindHostWithPath(manager, "/background.html", 1);
+  ExtensionHost* host = FindBackgroundHostWithPath(manager,
+                                                   "/background.html", 1);
 
   // Grab a handle to the DevToolsManager so we can forward messages to it.
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
 
   // Grab the tab_id of whatever tab happens to be first.
   WebContents* web_contents = browser()->GetWebContentsAt(0);
   ASSERT_TRUE(web_contents);
   int tab_id = ExtensionTabUtil::GetTabId(web_contents);
 
   // Test setup.
@@ skipping 32 matching lines @@
 
 
 // Tests that ref counting of listeners from multiple processes works.
 IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, ProcessRefCounting) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("devtools").AppendASCII("timeline_api")));
 
   // Get the ExtensionHost that is hosting our background page.
   ExtensionProcessManager* manager =
       browser()->profile()->GetExtensionProcessManager();
-  ExtensionHost* host_one = FindHostWithPath(manager, "/background.html", 1);
+  ExtensionHost* host_one = FindBackgroundHostWithPath(manager,
+                                                       "/background.html", 1);
 
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("devtools").AppendASCII("timeline_api_two")));
-  ExtensionHost* host_two = FindHostWithPath(manager,
-                                             "/background_two.html", 2);
+  ExtensionHost* host_two = FindBackgroundHostWithPath(manager,
+                                                       "/background_two.html",
+                                                       2);
 
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
 
   // Grab the tab_id of whatever tab happens to be first.
   WebContents* web_contents = browser()->GetWebContentsAt(0);
   ASSERT_TRUE(web_contents);
   int tab_id = ExtensionTabUtil::GetTabId(web_contents);
 
   // Test setup.
   bool result = false;
@@ skipping 29 matching lines @@
   // Removing the listeners from the second extension should tear the bridge
   // down.
   result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host_two->render_view_host(), L"", L"unregisterListeners()", &result));
   EXPECT_TRUE(result);
   ASSERT_FALSE(devtools_manager->GetDevToolsClientHostFor(
       DevToolsAgentHostRegistry::GetDevToolsAgentHost(
           web_contents->GetRenderViewHost())));
 }