Remove BrowserIterator

chrome/browser/ui/panels/panel_browsertest.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/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/task_management/task_management_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.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/browser_window.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/docked_panel_collection.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/test_panel_active_state_observer.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
@@ skipping 1597 matching lines @@
       chrome::NOTIFICATION_BROWSER_WINDOW_READY,
       content::NotificationService::AllSources());
   EXPECT_TRUE(panel->ExecuteCommandIfEnabled(IDC_DEV_TOOLS));
   signal.Wait();
 
   // Check that the new browser window that opened is dev tools window.
   ++num_browsers;
   EXPECT_EQ(num_browsers, chrome::GetBrowserCount(
                               browser()->profile(),
                               browser()->host_desktop_type()));
-  for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
-    if (*iter == browser())
+  for (auto& b : *BrowserList::GetInstance()) {
+    if (b == browser())
       continue;
-    ASSERT_TRUE((*iter)->is_devtools());
+    ASSERT_TRUE(b->is_devtools());
   }
 
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DevToolsConsole) {
   // Create a test panel with web contents loaded.
   CreatePanelParams params("1", gfx::Rect(0, 0, 200, 220), SHOW_AS_ACTIVE);
   GURL url(ui_test_utils::GetTestUrl(
       base::FilePath(kTestDir),
@@ skipping 10 matching lines @@
       chrome::NOTIFICATION_BROWSER_WINDOW_READY,
       content::NotificationService::AllSources());
   EXPECT_TRUE(panel->ExecuteCommandIfEnabled(IDC_DEV_TOOLS_CONSOLE));
   signal.Wait();
 
   // Check that the new browser window that opened is dev tools window.
   ++num_browsers;
   EXPECT_EQ(num_browsers, chrome::GetBrowserCount(
                               browser()->profile(),
                               browser()->host_desktop_type()));
-  for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
-    if (*iter == browser())
+  for (auto& b : *BrowserList::GetInstance()) {
+    if (b == browser())
       continue;
-    ASSERT_TRUE((*iter)->is_devtools());
+    ASSERT_TRUE(b->is_devtools());
   }
 
   panel->Close();
 }
 
 #if defined(OS_WIN)
 #define MAYBE_Accelerator Accelerator
 #else
 #define MAYBE_Accelerator DISABLED_Accelerator
 #endif
@@ skipping 170 matching lines @@
                                expected_prefix,
                                base::CompareCase::INSENSITIVE_ASCII));
 
   PanelManager::GetInstance()->CloseAll();
   EXPECT_EQ(1U, task_manager.tasks().size());
 }
 
 }  // namespace
 
 #endif  // defined(ENABLE_TASK_MANAGER)