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

chrome/browser/ui/startup/startup_browser_creator_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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_impl.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/session_restore.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/browser_list_observer.h"
 #include "chrome/browser/ui/browser_window.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/tab_strip_model.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ skipping 50 matching lines @@
     service->extension_prefs()->SetLaunchType(app_id, launch_type);
   }
 
   // Check that there are two browsers.  Find the one that is not |browser()|.
   void FindOneOtherBrowser(Browser** out_other_browser) {
     // There should only be one other browser.
     ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
 
     // Find the new browser.
     Browser* other_browser = NULL;
-    for (BrowserList::const_iterator i = BrowserList::begin();
-         i != BrowserList::end() && !other_browser; ++i) {
-      if (*i != browser())
-        other_browser = *i;
+  for (chrome::BrowserIterator it; !it.done() && !other_browser; it.Next()) {
+      if (*it != browser())
+        other_browser = *it;
     }
     ASSERT_TRUE(other_browser);
     ASSERT_TRUE(other_browser != browser());
     *out_other_browser = other_browser;
   }
 
   Browser* FindOneOtherBrowserForProfile(Profile* profile,
                                          Browser* not_this_browser) {
-    for (BrowserList::const_iterator i = BrowserList::begin();
-         i != BrowserList::end(); ++i) {
-      if (*i != not_this_browser && (*i)->profile() == profile)
-        return *i;
+    for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+      if (*it != not_this_browser && it->profile() == profile)
+        return *it;
     }
     return NULL;
   }
 };
 
 class OpenURLsPopupObserver : public chrome::BrowserListObserver {
  public:
   OpenURLsPopupObserver() : added_browser_(NULL) { }
 
   virtual void OnBrowserAdded(Browser* browser) OVERRIDE {
@@ skipping 757 matching lines @@
   new_browser = FindOneOtherBrowserForProfile(profile_urls, NULL);
   ASSERT_TRUE(new_browser);
   tab_strip = new_browser->tab_strip_model();
   ASSERT_EQ(1, tab_strip->count());
   web_contents = tab_strip->GetWebContentsAt(0);
   EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), web_contents->GetURL());
   EXPECT_EQ(1U,
             InfoBarService::FromWebContents(web_contents)->GetInfoBarCount());
 }
 #endif  // !OS_CHROMEOS