diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-28 19:46:46 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-28 19:46:46 +0000 |
| commit | 52ff7d936494f2cc8045cfae0791cd2afbe651c6 (patch) | |
| tree | b89722002720748b28c7b214035aa0ce7006ca18 /chrome/browser/chrome_main_browsertest.cc | |
| parent | 4d8a2c7a25ba42015aa08718149a9f1c3d32614b (diff) | |
| download | chromium_src-52ff7d936494f2cc8045cfae0791cd2afbe651c6.zip chromium_src-52ff7d936494f2cc8045cfae0791cd2afbe651c6.tar.gz chromium_src-52ff7d936494f2cc8045cfae0791cd2afbe651c6.tar.bz2 | |
browser: Start moving browser_finder.h into chrome namespace.
BUG=133088
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11301010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_main_browsertest.cc')
| -rw-r--r-- | chrome/browser/chrome_main_browsertest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc index 50e45a6..0236d409 100644 --- a/chrome/browser/chrome_main_browsertest.cc +++ b/chrome/browser/chrome_main_browsertest.cc @@ -42,7 +42,7 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunch) { ui_test_utils::BrowserAddedObserver observer; Relaunch(GetCommandLineForRelaunch()); observer.WaitForSingleNewBrowser(); - ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile())); + ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile())); } IN_PROC_BROWSER_TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) { @@ -71,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) { IN_PROC_BROWSER_TEST_F(ChromeMainTest, MAYBE_SecondLaunchWithIncognitoUrl) { // We should start with one normal window. - ASSERT_EQ(1u, browser::GetTabbedBrowserCount(browser()->profile())); + ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile())); // Run with --incognito switch and an URL specified. FilePath test_file_path = ui_test_utils::GetTestFilePath( @@ -88,18 +88,18 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, MAYBE_SecondLaunchWithIncognitoUrl) { observer.WaitForSingleNewBrowser(); ASSERT_EQ(2u, BrowserList::size()); - ASSERT_EQ(1u, browser::GetTabbedBrowserCount(browser()->profile())); + ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile())); } IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) { // We should start with one normal window. - ASSERT_EQ(1u, browser::GetTabbedBrowserCount(browser()->profile())); + ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile())); // Create an incognito window. chrome::NewIncognitoWindow(browser()); ASSERT_EQ(2u, BrowserList::size()); - ASSERT_EQ(1u, browser::GetTabbedBrowserCount(browser()->profile())); + ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile())); // Close the first window. Profile* profile = browser()->profile(); @@ -111,7 +111,7 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) { // There should only be the incognito window open now. ASSERT_EQ(1u, BrowserList::size()); - ASSERT_EQ(0u, browser::GetTabbedBrowserCount(profile)); + ASSERT_EQ(0u, chrome::GetTabbedBrowserCount(profile)); // Run with just an URL specified, no --incognito switch. FilePath test_file_path = ui_test_utils::GetTestFilePath( @@ -126,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) { // There should be one normal and one incognito window now. ASSERT_EQ(2u, BrowserList::size()); - ASSERT_EQ(1u, browser::GetTabbedBrowserCount(profile)); + ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(profile)); } #endif // !OS_MACOSX |