diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 20:45:03 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 20:45:03 +0000 |
| commit | 91fdfe2fe39c1fb55708f2d65203caecdbdbfa34 (patch) | |
| tree | 360c16ba741ee4d06246019a4d877027a38ee550 /chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc | |
| parent | 12fb504d1dc73cd2ebf01c4c5262bea23720dd0b (diff) | |
| download | chromium_src-91fdfe2fe39c1fb55708f2d65203caecdbdbfa34.zip chromium_src-91fdfe2fe39c1fb55708f2d65203caecdbdbfa34.tar.gz chromium_src-91fdfe2fe39c1fb55708f2d65203caecdbdbfa34.tar.bz2 | |
Disable timing out test FullscreenControllerBrowserTest.BrowserFullscreenMouseLockContentSettings on linux.
BUG=143930
TBR=yzshen
Review URL: https://chromiumcodereview.appspot.com/10836364
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc index 563508c..25b5c16 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc @@ -180,8 +180,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, TestFullscreenMouseLockContentSettings(); } -#if defined(OS_MACOSX) -// http://crbug.com/103912 +#if defined(OS_MACOSX) || defined(OS_LINUX) +// http://crbug.com/103912 Mac +// http://crbug.com/143930 Linux #define MAYBE_BrowserFullscreenMouseLockContentSettings \ DISABLED_BrowserFullscreenMouseLockContentSettings #else |