diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 22:18:13 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 22:18:13 +0000 |
| commit | c82eaa5262da607ff04069cefcf67df4cf5bbcb1 (patch) | |
| tree | 73c087115c2aace336505fd931dca1a6043ebdf7 /chrome/browser/views | |
| parent | 3b1ea24972af975f96f7bdf6040fbc5048ea8b6d (diff) | |
| download | chromium_src-c82eaa5262da607ff04069cefcf67df4cf5bbcb1.zip chromium_src-c82eaa5262da607ff04069cefcf67df4cf5bbcb1.tar.gz chromium_src-c82eaa5262da607ff04069cefcf67df4cf5bbcb1.tar.bz2 | |
Flaky tests on linux/view/64bit builds.
Also updated browser_tests to use #define instead of #if/else, like other tests.
BUG=28808
TEST=None
Review URL: http://codereview.chromium.org/442012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/find_bar_host_browsertest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/views/find_bar_host_browsertest.cc b/chrome/browser/views/find_bar_host_browsertest.cc index 383ebe5..f160da0 100644 --- a/chrome/browser/views/find_bar_host_browsertest.cc +++ b/chrome/browser/views/find_bar_host_browsertest.cc @@ -471,14 +471,12 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, } // Make sure Find box disappears on Navigate but not on Refresh. -#if defined(OS_LINUX) +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) // The last EXPECT_FALSE(fully_visible) is flaky (especially on // 64bit build.). See bug http://crbug.com/28629. -IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, - FLAKY_FindDisappearOnNavigate) { -#else -IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) { +#define FindDisappearOnNavigate FLAKY_FindDisappearOnNavigate #endif +IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) { HTTPTestServer* server = StartHTTPServer(); // First we navigate to our special focus tracking page. |