Moves methods for finding browsers to browser_finder.

chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

Index: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index 5f29058b56f123b8022301f0f85d75ec83269427..8f83a6a336b4598a4167cae96c295a69d74ba16c 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -17,6 +17,7 @@
 #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_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
@@ -59,7 +60,7 @@ class StartupBrowserCreatorTest : public ExtensionBrowserTest {
     ASSERT_TRUE(*out_app_extension);
 
     // Code that opens a new browser assumes we start with exactly one.
-    ASSERT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile()));
+    ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile()));
   }
 
   void SetAppLaunchPref(const std::string& app_id,
@@ -71,7 +72,7 @@ class StartupBrowserCreatorTest : public ExtensionBrowserTest {
   // 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, BrowserList::GetBrowserCount(browser()->profile()));
+    ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
 
     // Find the new browser.
     Browser* other_browser = NULL;
@@ -299,7 +300,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, OpenAppShortcutTabPref) {
 
   // When an app shortcut is open and the pref indicates a tab should
   // open, the tab is open in a new browser window.  Expect a new window.
-  ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile()));
+  ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
 
   Browser* new_browser = NULL;
   ASSERT_NO_FATAL_FAILURE(FindOneOtherBrowser(&new_browser));
@@ -416,13 +417,13 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, StartupURLsForTwoProfiles) {
   Browser* new_browser = NULL;
   // |browser()| is still around at this point, even though we've closed its
   // window. Thus the browser count for default_profile is 2.
-  ASSERT_EQ(2u, BrowserList::GetBrowserCount(default_profile));
+  ASSERT_EQ(2u, browser::GetBrowserCount(default_profile));
   new_browser = FindOneOtherBrowserForProfile(default_profile, browser());
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());
   EXPECT_EQ(urls1[0], new_browser->GetWebContentsAt(0)->GetURL());
 
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(other_profile));
+  ASSERT_EQ(1u, browser::GetBrowserCount(other_profile));
   new_browser = FindOneOtherBrowserForProfile(other_profile, NULL);
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());
@@ -486,14 +487,14 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, UpdateWithTwoProfiles) {
   EXPECT_TRUE(profile2->restored_last_session());
 
   Browser* new_browser = NULL;
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(profile1));
+  ASSERT_EQ(1u, browser::GetBrowserCount(profile1));
   new_browser = FindOneOtherBrowserForProfile(profile1, NULL);
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());
   EXPECT_EQ(GURL(chrome::kAboutBlankURL),
             new_browser->GetWebContentsAt(0)->GetURL());
 
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(profile2));
+  ASSERT_EQ(1u, browser::GetBrowserCount(profile2));
   new_browser = FindOneOtherBrowserForProfile(profile2, NULL);
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());
@@ -571,7 +572,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
   Browser* new_browser = NULL;
   // The last open profile (the profile_home1 in this case) will always be
   // launched, even if it will open just the home page.
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(profile_home1));
+  ASSERT_EQ(1u, browser::GetBrowserCount(profile_home1));
   new_browser = FindOneOtherBrowserForProfile(profile_home1, NULL);
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());
@@ -579,14 +580,14 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
             new_browser->GetWebContentsAt(0)->GetURL());
 
   // profile_urls opened the urls.
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(profile_urls));
+  ASSERT_EQ(1u, browser::GetBrowserCount(profile_urls));
   new_browser = FindOneOtherBrowserForProfile(profile_urls, NULL);
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());
   EXPECT_EQ(urls[0], new_browser->GetWebContentsAt(0)->GetURL());
 
   // profile_last opened the last open pages.
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(profile_last));
+  ASSERT_EQ(1u, browser::GetBrowserCount(profile_last));
   new_browser = FindOneOtherBrowserForProfile(profile_last, NULL);
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());
@@ -594,7 +595,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
             new_browser->GetWebContentsAt(0)->GetURL());
 
   // profile_home2 was not launched since it would've only opened the home page.
-  ASSERT_EQ(0u, BrowserList::GetBrowserCount(profile_home2));
+  ASSERT_EQ(0u, browser::GetBrowserCount(profile_home2));
 }
 
 IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {
@@ -658,7 +659,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {
 
   // The profile which normally opens the home page displays the new tab page.
   Browser* new_browser = NULL;
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(profile_home));
+  ASSERT_EQ(1u, browser::GetBrowserCount(profile_home));
   new_browser = FindOneOtherBrowserForProfile(profile_home, NULL);
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());
@@ -668,7 +669,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {
             infobar_count());
 
   // The profile which normally opens last open pages displays the new tab page.
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(profile_last));
+  ASSERT_EQ(1u, browser::GetBrowserCount(profile_last));
   new_browser = FindOneOtherBrowserForProfile(profile_last, NULL);
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());
@@ -678,7 +679,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {
             infobar_count());
 
   // The profile which normally opens URLs displays the new tab page.
-  ASSERT_EQ(1u, BrowserList::GetBrowserCount(profile_urls));
+  ASSERT_EQ(1u, browser::GetBrowserCount(profile_urls));
   new_browser = FindOneOtherBrowserForProfile(profile_urls, NULL);
   ASSERT_TRUE(new_browser);
   ASSERT_EQ(1, new_browser->tab_count());