diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 21:13:43 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 21:13:43 +0000 |
| commit | d8748144ec3fe1aab05e9b9aed83972fa8297c93 (patch) | |
| tree | e966a92611c37895d76c74dca66ace3f16827797 /chrome/browser/ui/browser_browsertest.cc | |
| parent | 08ac3eb427ae2b692bfab78e517bb9eec592bec9 (diff) | |
| download | chromium_src-d8748144ec3fe1aab05e9b9aed83972fa8297c93.zip chromium_src-d8748144ec3fe1aab05e9b9aed83972fa8297c93.tar.gz chromium_src-d8748144ec3fe1aab05e9b9aed83972fa8297c93.tar.bz2 | |
Moves methods for finding browsers to browser_finder.
BUG=none
TEST=none
R=ben@chromium.org
TBR=tim@chromium.org, davemoore@chromium.org, scottbyer@chromium.org, keybuk@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10391158
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_browsertest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 6b0127a..02a51c3 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -28,6 +28,7 @@ #include "chrome/browser/ui/app_modal_dialogs/js_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_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" @@ -769,7 +770,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) { WebContents* app_tab = browser()->AddSelectedTabWithURL( http_url, content::PAGE_TRANSITION_TYPED)->web_contents(); ASSERT_EQ(2, browser()->tab_count()); - ASSERT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile())); + ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile())); // Normal tabs should accept load drops. EXPECT_TRUE(initial_tab->GetMutableRendererPrefs()->can_accept_load_drops); @@ -779,7 +780,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) { browser()->ConvertContentsToApplication(app_tab); // The launch should have created a new browser. - ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile())); + ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile())); // Find the new browser. Browser* app_browser = NULL; @@ -907,7 +908,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) { // Check that the new browser has an app name. // The launch should have created a new browser. - ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile())); + ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile())); // Find the new browser. Browser* new_browser = NULL; @@ -1259,7 +1260,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { launch.ProcessStartupURLs(std::vector<GURL>()); // The launch should have created a new browser. - ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile())); + ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile())); // Find the new browser. Browser* new_browser = NULL; @@ -1337,7 +1338,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) { EXPECT_EQ(extension_app->GetFullLaunchURL(), app_window->GetURL()); // The launch should have created a new browser. - ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile())); + ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile())); // Find the new browser. Browser* new_browser = NULL; |