Remove BrowserIterator

chrome/browser/extensions/window_open_apitest.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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.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/panels/panel_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_constants.h"
@@ skipping 65 matching lines @@
     content::RunAllPendingInMessageLoop();
   }
 
   EXPECT_EQ(num_browsers,
             chrome::GetBrowserCount(browser->profile(),
                                     browser->host_desktop_type()));
   EXPECT_EQ(num_tabs, browser->tab_strip_model()->count());
   EXPECT_EQ(num_panels, GetPanelCount(browser));
 
   int num_popups_seen = 0;
-  for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
-    if (*iter == browser)
+  for (auto& b : *BrowserList::GetInstance()) {
+    if (b == browser)
       continue;
 
-    EXPECT_TRUE((*iter)->is_type_popup());
+    EXPECT_TRUE(b->is_type_popup());
     ++num_popups_seen;
   }
   EXPECT_EQ(num_popups, num_popups_seen);
 
   return ((num_browsers ==
                chrome::GetBrowserCount(browser->profile(),
                                        browser->host_desktop_type())) &&
           (num_tabs == browser->tab_strip_model()->count()) &&
           (num_panels == GetPanelCount(browser)) &&
           (num_popups == num_popups_seen));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BrowserIsApp) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("browser_is_app")));
 
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), 0, 2, 0));
 
-  for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
-    if (*iter == browser())
-      ASSERT_FALSE(iter->is_app());
+  for (auto& b : *BrowserList::GetInstance()) {
+    if (b == browser())
+      ASSERT_FALSE(b->is_app());
     else
-      ASSERT_TRUE(iter->is_app());
+      ASSERT_TRUE(b->is_app());
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpenPopupDefault) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("popup")));
 
   const int num_tabs = 1;
   const int num_popups = 0;
@@ skipping 392 matching lines @@
                      last_loaded_extension_id() + "/newtab.html"),
                  false,
                  &newtab));
 
   // Extension API should succeed.
   bool result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()",
                                                    &result));
   EXPECT_TRUE(result);
 }