| Index: chrome/browser/extensions/extension_browsertest.cc
 | 
| diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
 | 
| index f8358fa173e148a59a0eeb3c9c1b298914e8e316..d7ce21692a478d9c1e02b0f0a33da54411fe8df3 100644
 | 
| --- a/chrome/browser/extensions/extension_browsertest.cc
 | 
| +++ b/chrome/browser/extensions/extension_browsertest.cc
 | 
| @@ -17,7 +17,6 @@
 | 
|  #include "chrome/browser/extensions/crx_installer.h"
 | 
|  #include "chrome/browser/extensions/extension_creator.h"
 | 
|  #include "chrome/browser/extensions/extension_error_reporter.h"
 | 
| -#include "chrome/browser/extensions/extension_host.h"
 | 
|  #include "chrome/browser/extensions/extension_install_ui.h"
 | 
|  #include "chrome/browser/extensions/extension_service.h"
 | 
|  #include "chrome/browser/extensions/unpacked_installer.h"
 | 
| @@ -31,6 +30,7 @@
 | 
|  #include "chrome/test/base/ui_test_utils.h"
 | 
|  #include "content/public/browser/notification_registrar.h"
 | 
|  #include "content/public/browser/notification_service.h"
 | 
| +#include "content/public/browser/render_view_host.h"
 | 
|  
 | 
|  ExtensionBrowserTest::ExtensionBrowserTest()
 | 
|      : loaded_(false),
 | 
| @@ -395,9 +395,11 @@ bool ExtensionBrowserTest::WaitForExtensionHostsToLoad() {
 | 
|  
 | 
|    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();
 | 
| @@ -405,7 +407,7 @@ bool ExtensionBrowserTest::WaitForExtensionHostsToLoad() {
 | 
|        // Test activity may have modified the set of extension processes during
 | 
|        // message processing, so re-start the iteration to catch added/removed
 | 
|        // processes.
 | 
| -      iter = manager->begin();
 | 
| +      iter = all_views.begin();
 | 
|      }
 | 
|    }
 | 
|    return true;
 | 
| 
 |