diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 21:22:21 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 21:22:21 +0000 |
| commit | 3561b7ac33c2eb4b6dd9ea7e1eeffca801ee1572 (patch) | |
| tree | 0a6b5a220b45b952ba9d5c8a615315bdaf1075e5 /chrome/browser | |
| parent | 882df7ebc1387fe347f21c5044374a0176eee8a9 (diff) | |
| download | chromium_src-3561b7ac33c2eb4b6dd9ea7e1eeffca801ee1572.zip chromium_src-3561b7ac33c2eb4b6dd9ea7e1eeffca801ee1572.tar.gz chromium_src-3561b7ac33c2eb4b6dd9ea7e1eeffca801ee1572.tar.bz2 | |
Fix ChromeMainTest tests on CrOS.
Review URL: https://chromiumcodereview.appspot.com/10221002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chrome_main_browsertest.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc index 7b1beba..5f38cb2 100644 --- a/chrome/browser/chrome_main_browsertest.cc +++ b/chrome/browser/chrome_main_browsertest.cc @@ -25,10 +25,6 @@ // for details. #if !defined(OS_MACOSX) -// These tests hang on the build/try bot but pass locally with chromeos=1 -// builds. jam is investigatin -#if !defined(OS_CHROMEOS) - class ChromeMainTest : public InProcessBrowserTest { public: ChromeMainTest() {} @@ -127,6 +123,4 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) { ASSERT_EQ(1u, BrowserList::GetBrowserCountForType(profile, true)); } -#endif // !OS_CHROMEOS - #endif // !OS_MACOSX |