Remove EPM:all_hosts_ and use all_extension_views_ instead.

chrome/browser/debugger/devtools_sanity_unittest.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/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/debugger/devtools_window.h"
-#include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 180 matching lines @@
       MessageLoop::current()->PostDelayedTask(
           FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(4));
       extensions::UnpackedInstaller::Create(service)->Load(path);
       ui_test_utils::RunMessageLoop();
       timeout.Cancel();
     }
     size_t num_after = service->extensions()->size();
     if (num_after != (num_before + 1))
       return false;
 
-    return WaitForExtensionHostsToLoad();
+    return WaitForExtensionViewsToLoad();
   }
 
-  bool WaitForExtensionHostsToLoad() {
-    // Wait for all the extension hosts that exist to finish loading.
-    // NOTE: This assumes that the extension host list is not changing while
+  bool WaitForExtensionViewsToLoad() {
+    // Wait for all the extension render views that exist to finish loading.
+    // NOTE: This assumes that the extension views list is not changing while
     // this method is running.
 
     content::NotificationRegistrar registrar;
     registrar.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                   content::NotificationService::AllSources());
     base::CancelableClosure timeout(
         base::Bind(&TimeoutCallback, "Extension host load timed out."));
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(4));
 
     ExtensionProcessManager* manager =
           browser()->profile()->GetExtensionProcessManager();
-    for (ExtensionProcessManager::const_iterator iter = manager->begin();
-         iter != manager->end();) {
-      if ((*iter)->did_stop_loading())
+    ExtensionProcessManager::ViewSet all_views = manager->GetAllViews();
+    for (ExtensionProcessManager::ViewSet::const_iterator iter =
+             all_views.begin();
+         iter != all_views.end();) {
+      if (!(*iter)->IsLoading())
         ++iter;
       else
         ui_test_utils::RunMessageLoop();
     }
 
     timeout.Cancel();
     return true;
   }
 
   void Observe(int type,
@@ skipping 360 matching lines @@
                                         content::CONSOLE_MESSAGE_LEVEL_LOG,
                                         "log");
   devtools_manager->AddMessageToConsole(agent_host,
                                         content::CONSOLE_MESSAGE_LEVEL_ERROR,
                                         "error");
   RunTestFunction(window_, "checkLogAndErrorMessages");
   CloseDevToolsWindow();
 }
 
 }  // namespace