Remove BrowserIterator

chrome/test/base/ui_test_utils.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 "chrome/test/base/ui_test_utils.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 11 matching lines @@
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.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_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 128 matching lines @@
     WindowOpenDisposition disposition,
     int browser_test_flags) {
   TabStripModel* tab_strip = browser->tab_strip_model();
   if (disposition == CURRENT_TAB && tab_strip->GetActiveWebContents())
       content::WaitForLoadStop(tab_strip->GetActiveWebContents());
   content::TestNavigationObserver same_tab_observer(
       tab_strip->GetActiveWebContents(),
       number_of_navigations);
 
   std::set<Browser*> initial_browsers;
-  for (chrome::BrowserIterator it; !it.done(); it.Next())
-    initial_browsers.insert(*it);
+  for (auto& browser : *BrowserList::GetInstance())
+    initial_browsers.insert(browser);
 
   content::WindowedNotificationObserver tab_added_observer(
       chrome::NOTIFICATION_TAB_ADDED,
       content::NotificationService::AllSources());
 
   browser->OpenURL(OpenURLParams(
       url, Referrer(), disposition, ui::PAGE_TRANSITION_TYPED, false));
   if (browser_test_flags & BROWSER_TEST_WAIT_FOR_BROWSER)
     browser = WaitForBrowserNotInSet(initial_browsers);
   if (browser_test_flags & BROWSER_TEST_WAIT_FOR_TAB)
@@ skipping 160 matching lines @@
   location_bar->AcceptInput();
   while (!omnibox->model()->autocomplete_controller()->done()) {
     content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
         content::NotificationService::AllSources());
     observer.Wait();
   }
 }
 
 Browser* GetBrowserNotInSet(const std::set<Browser*>& excluded_browsers) {
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-    if (excluded_browsers.find(*it) == excluded_browsers.end())
-      return *it;
+  for (auto& browser : *BrowserList::GetInstance()) {
+    if (excluded_browsers.find(browser) == excluded_browsers.end())
+      return browser;
   }
   return nullptr;
 }
 
 namespace {
 
 void GetCookiesCallback(base::WaitableEvent* event,
                         std::string* cookies,
                         const std::string& cookie_line) {
   *cookies = cookie_line;
@@ skipping 64 matching lines @@
   if (controller->GetWebContents()->GetURL() != url_)
     return;
 
   WindowedNotificationObserver::Observe(type, source, details);
 }
 
 BrowserAddedObserver::BrowserAddedObserver()
     : notification_observer_(
           chrome::NOTIFICATION_BROWSER_OPENED,
           content::NotificationService::AllSources()) {
-  for (chrome::BrowserIterator it; !it.done(); it.Next())
-    original_browsers_.insert(*it);
+  for (auto& browser : *BrowserList::GetInstance())
+    original_browsers_.insert(browser);
 }
 
 BrowserAddedObserver::~BrowserAddedObserver() {
 }
 
 Browser* BrowserAddedObserver::WaitForSingleNewBrowser() {
   notification_observer_.Wait();
   // Ensure that only a single new browser has appeared.
   EXPECT_EQ(original_browsers_.size() + 1, chrome::GetTotalBrowserCount());
   return GetBrowserNotInSet(original_browsers_);
@@ skipping 68 matching lines @@
         new content::MessageLoopRunner;
     WaitHistoryLoadedObserver observer(runner.get());
     ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
         scoped_observer(&observer);
     scoped_observer.Add(history_service);
     runner->Run();
   }
 }
 
 }  // namespace ui_test_utils