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

chrome/browser/ui/browser_close_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/logging.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_test_file_activity_observer.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/common/page_transition_types.h"
@@ skipping 175 matching lines @@
     // num_windows > 0
     Profile* profile((*base_browser)->profile());
     for (int w = 1; w < num_windows; ++w) {
       CreateBrowserOnProfile(profile);
     }
     return true;
   }
 
   int TotalUnclosedBrowsers() {
     int count = 0;
-    for (BrowserList::const_iterator iter = BrowserList::begin();
-         iter != BrowserList::end(); ++iter)
-      if (!(*iter)->IsAttemptingToCloseBrowser()) {
+    for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+      if (!it->IsAttemptingToCloseBrowser())
         count++;
-      }
+    }
     return count;
   }
 
   // Note that this is invalid to call if TotalUnclosedBrowsers() == 0.
   Browser* FirstUnclosedBrowser() {
-    for (BrowserList::const_iterator iter = BrowserList::begin();
-         iter != BrowserList::end(); ++iter)
-      if (!(*iter)->IsAttemptingToCloseBrowser())
-        return (*iter);
+    for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+      if (!it->IsAttemptingToCloseBrowser())
+        return *it;
+    }
     return NULL;
   }
 
   bool SetupForDownloadCloseCheck() {
     first_profile_ = browser()->profile();
 
     bool result = first_profile_downloads_dir_.CreateUniqueTempDir();
     EXPECT_TRUE(result);
     if (!result) return false;
     first_profile_->GetPrefs()->SetFilePath(
@@ skipping 115 matching lines @@
     if (type != Browser::DOWNLOAD_CLOSE_OK)
       EXPECT_EQ(check_case.num_blocking, num_downloads_blocking)
           << "Case " << i
           << ": " << check_case.DebugString();
 
     // Release all the downloads.
     CompleteAllDownloads(browser_to_probe);
 
     // Create a new main window and kill everything else.
     entry_browser = CreateBrowserOnProfile(first_profile_);
-    for (BrowserList::const_iterator bit = BrowserList::begin();
-         bit != BrowserList::end(); ++bit) {
-      if ((*bit) != entry_browser) {
-        EXPECT_TRUE((*bit)->window());
-        if (!(*bit)->window())
+    for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+      if ((*it) != entry_browser) {
+        if (!it->window()) {
+          ADD_FAILURE();
           return false;
-        (*bit)->window()->Close();
+        }
+        it->window()->Close();
       }
     }
     content::RunAllPendingInMessageLoop();
 
     return true;
   }
 
   static const DownloadsCloseCheckCase download_close_check_cases[];
 
   // DownloadCloseCheck variables.
@@ skipping 177 matching lines @@
   }
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) {
   ASSERT_TRUE(SetupForDownloadCloseCheck());
   for (size_t i = 5 * arraysize(download_close_check_cases) / 6;
        i < 6 * arraysize(download_close_check_cases) / 6; ++i) {
     ExecuteDownloadCloseCheckCase(i);
   }
 }