Remove BrowserIterator

chrome/browser/ui/extensions/hosted_app_browsertest.cc

 // Copyright 2015 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 <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/devtools/devtools_window_testing.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_iterator.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/constants.h"
@@ skipping 30 matching lines @@
         extensions::Manifest::INTERNAL,
         is_bookmark_app ? extensions::Extension::FROM_BOOKMARK
                         : extensions::Extension::NO_FLAGS);
     ASSERT_TRUE(app);
 
     // Launch it in a window.
     ASSERT_TRUE(OpenApplication(AppLaunchParams(
         browser()->profile(), app, extensions::LAUNCH_CONTAINER_WINDOW,
         NEW_WINDOW, extensions::SOURCE_TEST)));
 
-    for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-      if (*it == browser())
+    for (auto& b : *BrowserList::GetInstance()) {
+      if (b == browser())
         continue;
 
       std::string browser_app_id =
-          web_app::GetExtensionIdFromApplicationName((*it)->app_name());
+          web_app::GetExtensionIdFromApplicationName(b->app_name());
       if (browser_app_id == app->id()) {
-        app_browser_ = *it;
+        app_browser_ = b;
         break;
       }
     }
 
     ASSERT_TRUE(app_browser_);
     ASSERT_TRUE(app_browser_ != browser());
   }
 
   Browser* app_browser_;
 };
@@ skipping 141 matching lines @@
       DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false);
 
   // The launch should have created a new app browser and a dev tools browser.
   ASSERT_EQ(4u, chrome::GetBrowserCount(browser()->profile(),
                                         browser()->host_desktop_type()));
 
   // Find the new browsers.
   Browser* bookmark_app_browser = nullptr;
   Browser* packaged_app_browser = nullptr;
   Browser* dev_tools_browser = nullptr;
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-    if (*it == browser()) {
+  for (auto& b : *BrowserList::GetInstance()) {
+    if (b == browser()) {
       continue;
-    } else if ((*it)->app_name() == DevToolsWindow::kDevToolsApp) {
-      dev_tools_browser = *it;
-    } else if ((*it)->tab_strip_model()->GetActiveWebContents() ==
+    } else if (b->app_name() == DevToolsWindow::kDevToolsApp) {
+      dev_tools_browser = b;
+    } else if (b->tab_strip_model()->GetActiveWebContents() ==
                bookmark_app_window) {
-      bookmark_app_browser = *it;
+      bookmark_app_browser = b;
     } else {
-      packaged_app_browser = *it;
+      packaged_app_browser = b;
     }
   }
   ASSERT_TRUE(dev_tools_browser);
   ASSERT_TRUE(bookmark_app_browser);
   ASSERT_TRUE(bookmark_app_browser != browser());
   ASSERT_TRUE(packaged_app_browser);
   ASSERT_TRUE(packaged_app_browser != browser());
   ASSERT_TRUE(packaged_app_browser != bookmark_app_browser);
 
   EXPECT_FALSE(browser()->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME));
   EXPECT_FALSE(
       dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME));
   EXPECT_EQ(browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH,
             bookmark_app_browser->SupportsWindowFeature(
                 Browser::FEATURE_WEBAPPFRAME));
   EXPECT_FALSE(packaged_app_browser->SupportsWindowFeature(
       Browser::FEATURE_WEBAPPFRAME));
 
   DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
 }