diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 04:57:05 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 04:57:05 +0000 |
| commit | 7988888cbb78f8ec97cdfcbd542429bd87d99d9b (patch) | |
| tree | f5d01c3780e91e621d01c36a055895b63fc9a1f1 | |
| parent | 17dc1ffebada70c3144c88f693ec828f3e7b2817 (diff) | |
| download | chromium_src-7988888cbb78f8ec97cdfcbd542429bd87d99d9b.zip chromium_src-7988888cbb78f8ec97cdfcbd542429bd87d99d9b.tar.gz chromium_src-7988888cbb78f8ec97cdfcbd542429bd87d99d9b.tar.bz2 | |
FullscreenControllerBrowserTest.FullscreenMouseLockContentSettings is flaky.
BUG=133831
TEST=none
TBR=scheib@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10600014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143347 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/fullscreen_controller_browsertest.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/ui/fullscreen_controller_browsertest.cc b/chrome/browser/ui/fullscreen_controller_browsertest.cc index fef1e51..f35dd2f2 100644 --- a/chrome/browser/ui/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/fullscreen_controller_browsertest.cc @@ -165,9 +165,18 @@ void FullscreenControllerBrowserTest::TestFullscreenMouseLockContentSettings() { ASSERT_FALSE(IsMouseLockPermissionRequested()); } +#if defined(OS_MACOSX) || defined(OS_LINUX) +// http://crbug.com/133831 +#define MAYBE_FullscreenMouseLockContentSettings \ + FLAKY_FullscreenMouseLockContentSettings +#else +#define MAYBE_FullscreenMouseLockContentSettings \ + FullscreenMouseLockContentSettings +#endif + // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, - FullscreenMouseLockContentSettings) { + MAYBE_FullscreenMouseLockContentSettings) { TestFullscreenMouseLockContentSettings(); } @@ -330,4 +339,3 @@ IN_PROC_BROWSER_TEST_F( } } #endif - |