Get rid of native-desktop-only BrowserList:: iterator methods in tests.

chrome/browser/ui/browser_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 <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/prefs/pref_service.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.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_tabstrip.h"
 #include "chrome/browser/ui/browser_ui_prefs.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 749 matching lines @@
   EXPECT_TRUE(app_tab->GetMutableRendererPrefs()->can_accept_load_drops);
 
   // Turn |app_tab| into a tab in an app panel.
   chrome::ConvertTabToAppWindow(browser(), app_tab);
 
   // The launch should have created a new browser.
   ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
 
   // Find the new browser.
   Browser* app_browser = NULL;
-  for (BrowserList::const_iterator i = BrowserList::begin();
-       i != BrowserList::end() && !app_browser; ++i) {
-    if (*i != browser())
-      app_browser = *i;
+  for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) {
+    if (*it != browser())
+      app_browser = *it;
   }
   ASSERT_TRUE(app_browser);
 
   // Check that the tab contents is in the new browser, and not in the old.
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
   ASSERT_EQ(initial_tab, browser()->tab_strip_model()->GetWebContentsAt(0));
 
   // Check that the appliaction browser has a single tab, and that tab contains
   // the content that we app-ified.
   ASSERT_EQ(1, app_browser->tab_strip_model()->count());
@@ skipping 112 matching lines @@
       chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
   StartupBrowserCreatorImpl launch(base::FilePath(), command_line, first_run);
   ASSERT_TRUE(launch.OpenApplicationWindow(browser()->profile(), NULL));
 
   // Check that the new browser has an app name.
   // The launch should have created a new browser.
   ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
 
   // Find the new browser.
   Browser* new_browser = NULL;
-  for (BrowserList::const_iterator i = BrowserList::begin();
-       i != BrowserList::end() && !new_browser; ++i) {
-    if (*i != browser())
-      new_browser = *i;
+  for (chrome::BrowserIterator it; !it.done() && !new_browser; it.Next()) {
+    if (*it != browser())
+      new_browser = *it;
   }
   ASSERT_TRUE(new_browser);
   ASSERT_TRUE(new_browser != browser());
 
   // The browser's app_name should include the app's ID.
   ASSERT_NE(
       new_browser->app_name_.find(extension_app->id()),
       std::string::npos) << new_browser->app_name_;
 }
 #endif
@@ skipping 84 matching lines @@
       chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
   StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
   launch.profile_ = browser()->profile();
   launch.ProcessStartupURLs(std::vector<GURL>());
 
   // The launch should have created a new browser.
   ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
 
   // Find the new browser.
   Browser* new_browser = NULL;
-  for (BrowserList::const_iterator i = BrowserList::begin();
-       i != BrowserList::end() && !new_browser; ++i) {
-    if (*i != browser())
-      new_browser = *i;
+  for (chrome::BrowserIterator it; !it.done() && !new_browser; it.Next()) {
+    if (*it != browser())
+      new_browser = *it;
   }
   ASSERT_TRUE(new_browser);
   ASSERT_TRUE(new_browser != browser());
 
   // We should get back an additional tab for the app, and another for the
   // default home page.
   ASSERT_EQ(3, new_browser->tab_strip_model()->count());
 
   // Make sure the state matches.
   TabStripModel* new_model = new_browser->tab_strip_model();
@@ skipping 45 matching lines @@
   ASSERT_TRUE(extensions::TabHelper::FromWebContents(app_window));
   EXPECT_FALSE(
       extensions::TabHelper::FromWebContents(app_window)->extension_app());
   EXPECT_EQ(extension_app->GetFullLaunchURL(), app_window->GetURL());
 
   // The launch should have created a new browser.
   ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
 
   // Find the new browser.
   Browser* new_browser = NULL;
-  for (BrowserList::const_iterator i = BrowserList::begin();
-       i != BrowserList::end() && !new_browser; ++i) {
-    if (*i != browser())
-      new_browser = *i;
+  for (chrome::BrowserIterator it; !it.done() && !new_browser; it.Next()) {
+    if (*it != browser())
+      new_browser = *it;
   }
   ASSERT_TRUE(new_browser);
   ASSERT_TRUE(new_browser != browser());
 
   EXPECT_TRUE(new_browser->is_app());
 
   // The browser's app name should include the extension's id.
   std::string app_name = new_browser->app_name_;
   EXPECT_NE(app_name.find(extension_app->id()), std::string::npos)
       << "Name " << app_name << " should contain id "<< extension_app->id();
@@ skipping 892 matching lines @@
   RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
 }
 
 // Shift-middle-clicks open in a foreground tab.
 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {
   int modifiers = WebKit::WebInputEvent::ShiftKey;
   WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle;
   WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
   RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
 }