Remove BrowserIterator

chrome/browser/sessions/session_restore_browsertest_chromeos.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 <list>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/ui/browser.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/host_desktop.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/sessions/core/serialized_navigation_entry_test_helper.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 
 namespace {
@@ skipping 58 matching lines @@
       Browser::CreateParams(profile(), chrome::GetActiveDesktop()));
   // Create a third incognito browser window which should not get restored.
   CreateBrowserWithParams(Browser::CreateParams(
       profile()->GetOffTheRecordProfile(), chrome::GetActiveDesktop()));
   TurnOnSessionRestore();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, RestoreBrowserWindows) {
   size_t total_count = 0;
   size_t incognito_count = 0;
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+  for (auto* browser : *BrowserList::GetInstance()) {
     ++total_count;
-    if (it->profile()->IsOffTheRecord())
+    if (browser->profile()->IsOffTheRecord())
       ++incognito_count;
   }
   EXPECT_EQ(2u, total_count);
   EXPECT_EQ(0u, incognito_count);
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, PRE_RestoreAppsV1) {
   // Create a trusted app popup.
   CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name1, true));
   // Create a second trusted app with two popup windows.
   CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name2, true));
   CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name2, true));
   // Create a third untrusted (child) app3 popup. This should not get restored.
   CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name2, false));
 
   TurnOnSessionRestore();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, RestoreAppsV1) {
   size_t total_count = 0;
   size_t app1_count = 0;
   size_t app2_count = 0;
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+  for (auto* browser : *BrowserList::GetInstance()) {
     ++total_count;
-    if (it->app_name() == test_app_popup_name1)
+    if (browser->app_name() == test_app_popup_name1)
       ++app1_count;
-    if (it->app_name() == test_app_popup_name2)
+    if (browser->app_name() == test_app_popup_name2)
       ++app2_count;
   }
   EXPECT_EQ(1u, app1_count);
   EXPECT_EQ(2u, app2_count);  // Only the trusted app windows are restored.
   EXPECT_EQ(4u, total_count);  // Default browser() + 3 app windows
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, PRE_RestoreMaximized) {
   // One browser window is always created by default.
   ASSERT_TRUE(browser());
@@ skipping 13 matching lines @@
   EXPECT_TRUE(browser2->window()->IsMaximized());
   EXPECT_FALSE(app_browser1->window()->IsMaximized());
   EXPECT_TRUE(app_browser2->window()->IsMaximized());
 
   TurnOnSessionRestore();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, RestoreMaximized) {
   size_t total_count = 0;
   size_t maximized_count = 0;
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+  for (auto* browser : *BrowserList::GetInstance()) {
     ++total_count;
-    if (it->window()->IsMaximized())
+    if (browser->window()->IsMaximized())
       ++maximized_count;
   }
   EXPECT_EQ(4u, total_count);
   EXPECT_EQ(2u, maximized_count);
 }