diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-18 18:33:42 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-18 18:33:42 +0000 |
| commit | a6d2cd2351e1f71e17ea07f6ef22323c61af4f9b (patch) | |
| tree | 052cd4aec6f83ac6ba5a2723b707e158c0eaffef /chrome/browser/browser_browsertest.cc | |
| parent | d48ea4809916781231f5a08f9553aeed94e3e0f7 (diff) | |
| download | chromium_src-a6d2cd2351e1f71e17ea07f6ef22323c61af4f9b.zip chromium_src-a6d2cd2351e1f71e17ea07f6ef22323c61af4f9b.tar.gz chromium_src-a6d2cd2351e1f71e17ea07f6ef22323c61af4f9b.tar.bz2 | |
Disables browser test on chromeos as chromeos defaults to restoring
last session, which means my test doesn't test what I want it to. I
could make the test exercise the paths I want on chromeos by changing
what to do on startup, but it didn't seem worth it given the default.
BUG=NONE
TBR=erikkay@chromium.org
Review URL: http://codereview.chromium.org/1079002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index f6594a0..2c9f6ee 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -460,6 +460,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) { EXPECT_EQ("fr", current_tab->language_state().original_language()); } +// Chromeos defaults to restoring the last session, so this test isn't +// applicable. +#if !defined(OS_CHROMEOS) #if defined(OS_MAC) // http://crbug.com/38522 #define RestorePinnedTabs FLAKY_RestorePinnedTabs @@ -527,3 +530,4 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { EXPECT_TRUE(new_model->GetTabContentsAt(0)->app_extension() == app_extension); } +#endif |