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

chrome/browser/sessions/tab_restore_browsertest.cc

Index: chrome/browser/sessions/tab_restore_browsertest.cc
diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc
index efce48da3294d7de35436397c423778e699db6d3..a59105ad4e0b0d961a3bf0fc00eb98e0601b641c 100644
--- a/chrome/browser/sessions/tab_restore_browsertest.cc
+++ b/chrome/browser/sessions/tab_restore_browsertest.cc
@@ -10,7 +10,7 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_impl.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -33,7 +33,9 @@
 
 class TabRestoreTest : public InProcessBrowserTest {
  public:
-  TabRestoreTest() : InProcessBrowserTest() {
+  TabRestoreTest()
+      : native_browser_list(chrome::BrowserListImpl::GetInstance(
+                                chrome::HOST_DESKTOP_TYPE_NATIVE)) {
     url1_ = ui_test_utils::GetTestUrl(
         base::FilePath().AppendASCII("session_history"),
         base::FilePath().AppendASCII("bot1.html"));
@@ -44,8 +46,9 @@ class TabRestoreTest : public InProcessBrowserTest {
 
  protected:
   Browser* GetBrowser(int index) {
-    CHECK(static_cast<int>(BrowserList::size()) > index);
-    return *(BrowserList::begin() + index);
+
+    CHECK(static_cast<int>(native_browser_list->size()) > index);
+    return native_browser_list->get(index);
   }
 
   // Adds tabs to the given browser, all navigated to url1_. Returns
@@ -80,14 +83,14 @@ class TabRestoreTest : public InProcessBrowserTest {
   // window (since the index is 0-based).
   void RestoreTab(int expected_window_index,
                   int expected_tabstrip_index) {
-    int window_count = static_cast<int>(BrowserList::size());
+    int window_count = static_cast<int>(native_browser_list->size());
     ASSERT_GT(window_count, 0);
 
     bool expect_new_window = (expected_window_index == window_count);
 
     Browser* browser;
     if (expect_new_window) {
-      browser = *(BrowserList::begin());
+      browser = native_browser_list->get(0);
     } else {
       browser = GetBrowser(expected_window_index);
     }
@@ -106,7 +109,7 @@ class TabRestoreTest : public InProcessBrowserTest {
     tab_loaded_observer.Wait();
 
     if (expect_new_window) {
-      int new_window_count = static_cast<int>(BrowserList::size());
+      int new_window_count = static_cast<int>(native_browser_list->size());
       EXPECT_EQ(++window_count, new_window_count);
       browser = GetBrowser(expected_window_index);
     } else {
@@ -144,6 +147,9 @@ class TabRestoreTest : public InProcessBrowserTest {
   GURL url1_;
   GURL url2_;
 
+  // The TabRestore browser tests only uses the native desktop for now.
+  const chrome::BrowserListImpl* native_browser_list;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TabRestoreTest);
 };
@@ -202,7 +208,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreToDifferentWindow) {
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
-  EXPECT_EQ(2u, BrowserList::size());
+  EXPECT_EQ(2u, native_browser_list->size());
 
   // Restore tab into original browser.
   ASSERT_NO_FATAL_FAILURE(RestoreTab(0, closed_tab_index));
@@ -226,7 +232,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, DISABLED_BasicRestoreFromClosedWindow) {
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
-  EXPECT_EQ(2u, BrowserList::size());
+  EXPECT_EQ(2u, native_browser_list->size());
 
   // Close the final tab in the first browser.
   content::WindowedNotificationObserver window_observer(
@@ -288,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindowAndTab) {
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
-  EXPECT_EQ(2u, BrowserList::size());
+  EXPECT_EQ(2u, native_browser_list->size());
 
   // Close the first browser.
   content::WindowedNotificationObserver observer(
@@ -296,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindowAndTab) {
       content::NotificationService::AllSources());
   chrome::CloseWindow(browser());
   observer.Wait();
-  EXPECT_EQ(1u, BrowserList::size());
+  EXPECT_EQ(1u, native_browser_list->size());
 
   // Restore the first window. The expected_tabstrip_index (second argument)
   // indicates the expected active tab.
@@ -326,7 +332,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreIntoSameWindow) {
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
-  EXPECT_EQ(2u, BrowserList::size());
+  EXPECT_EQ(2u, native_browser_list->size());
 
   // Close all but one tab in the first browser, left to right.
   while (browser()->tab_strip_model()->count() > 1)
@@ -338,7 +344,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreIntoSameWindow) {
       content::NotificationService::AllSources());
   CloseTab(0);
   observer.Wait();
-  EXPECT_EQ(1u, BrowserList::size());
+  EXPECT_EQ(1u, native_browser_list->size());
 
   // Restore the last-closed tab into a new window.
   ASSERT_NO_FATAL_FAILURE(RestoreTab(1, 0));
@@ -463,11 +469,11 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest,
 
 IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) {
   // Create a new window.
-  size_t window_count = BrowserList::size();
+  size_t window_count = native_browser_list->size();
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
-  EXPECT_EQ(++window_count, BrowserList::size());
+  EXPECT_EQ(++window_count, native_browser_list->size());
 
   // Create two more tabs, one with url1, the other url2.
   int initial_tab_count = browser()->tab_strip_model()->count();
@@ -484,7 +490,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) {
       content::NotificationService::AllSources());
   chrome::CloseWindow(browser());
   close_window_observer.Wait();
-  EXPECT_EQ(window_count - 1, BrowserList::size());
+  EXPECT_EQ(window_count - 1, native_browser_list->size());
 
   // Restore the window.
   content::WindowedNotificationObserver open_window_observer(
@@ -493,9 +499,9 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) {
   content::WindowedNotificationObserver load_stop_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
-  chrome::RestoreTab(*BrowserList::begin());
+  chrome::RestoreTab(native_browser_list->get(0));
   open_window_observer.Wait();
-  EXPECT_EQ(window_count, BrowserList::size());
+  EXPECT_EQ(window_count, native_browser_list->size());
 
   Browser* browser = GetBrowser(1);
   EXPECT_EQ(initial_tab_count + 2, browser->tab_strip_model()->count());