diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 03:12:12 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 03:12:12 +0000 |
commit | cae97656821756121ae569faa1100963c8b5d4d2 (patch) | |
tree | 244ffc6a91916c8f81889deec8e3aa6090fb3227 /chrome/browser/browser_commands_unittest.cc | |
parent | 9bbb5c279cb33ee4ce45c8fe0c03e022f158a159 (diff) | |
download | chromium_src-cae97656821756121ae569faa1100963c8b5d4d2.zip chromium_src-cae97656821756121ae569faa1100963c8b5d4d2.tar.gz chromium_src-cae97656821756121ae569faa1100963c8b5d4d2.tar.bz2 |
Move a lot of ChromeOS stuff out of Browser and onto various Ash-related helpers.
BUG=none
TEST=none
TBR=davemoore
Review URL: https://chromiumcodereview.appspot.com/10035061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_commands_unittest.cc')
-rw-r--r-- | chrome/browser/browser_commands_unittest.cc | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index ea4d148..0013670 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -176,38 +176,3 @@ TEST_F(BrowserCommandsTest, BackForwardInNewTab) { ASSERT_EQ(url2, browser()->GetSelectedWebContents()->GetURL()); } -// Tests IDC_SEARCH (the Search key on Chrome OS devices). -#if defined(OS_CHROMEOS) - -namespace chromeos { - -TEST_F(BrowserCommandsTest, Search) { - ScopedMockUserManagerEnabler mock_user_manager; - EXPECT_CALL(*mock_user_manager.user_manager(), IsLoggedInAsGuest()) - .Times(1).WillRepeatedly(::testing::Return(false)); - - // Load a non-NTP URL. - GURL non_ntp_url("http://foo/"); - AddTab(browser(), non_ntp_url); - ASSERT_EQ(1, browser()->tab_count()); - EXPECT_EQ(non_ntp_url, browser()->GetSelectedWebContents()->GetURL()); - - // Pressing the Search key should open a new tab containing the NTP. - browser()->Search(); - ASSERT_EQ(2, browser()->tab_count()); - ASSERT_EQ(1, browser()->active_index()); - GURL current_url = browser()->GetSelectedWebContents()->GetURL(); - EXPECT_TRUE(current_url.SchemeIs(chrome::kChromeUIScheme)); - EXPECT_EQ(chrome::kChromeUINewTabHost, current_url.host()); - - // Pressing it a second time while the NTP is open shouldn't change anything. - browser()->Search(); - ASSERT_EQ(2, browser()->tab_count()); - ASSERT_EQ(1, browser()->active_index()); - current_url = browser()->GetSelectedWebContents()->GetURL(); - EXPECT_TRUE(current_url.SchemeIs(chrome::kChromeUIScheme)); - EXPECT_EQ(chrome::kChromeUINewTabHost, current_url.host()); -} - -} // namespace chromeos -#endif |