Commit b0e1ac9a authored by nsylvain@chromium.org's avatar nsylvain@chromium.org

Disable FullscreenControllerBrowserTest.BrowserFullscreenMouseLockContentSettings

It fails on 10.7

BUG=103912
TBR=rsesek
Review URL: https://chromiumcodereview.appspot.com/10854215

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152298 0039d316-1c4b-4281-b951-d872f2087c98
parent 4639187a
...@@ -174,17 +174,24 @@ void FullscreenControllerBrowserTest::TestFullscreenMouseLockContentSettings() { ...@@ -174,17 +174,24 @@ void FullscreenControllerBrowserTest::TestFullscreenMouseLockContentSettings() {
#define MAYBE_FullscreenMouseLockContentSettings \ #define MAYBE_FullscreenMouseLockContentSettings \
FullscreenMouseLockContentSettings FullscreenMouseLockContentSettings
#endif #endif
// Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK.
IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest,
MAYBE_FullscreenMouseLockContentSettings) { MAYBE_FullscreenMouseLockContentSettings) {
TestFullscreenMouseLockContentSettings(); TestFullscreenMouseLockContentSettings();
} }
#if defined(OS_MACOSX)
// http://crbug.com/103912
#define MAYBE_BrowserFullscreenMouseLockContentSettings \
DISABLED_BrowserFullscreenMouseLockContentSettings
#else
#define MAYBE_BrowserFullscreenMouseLockContentSettings \
BrowserFullscreenMouseLockContentSettings
#endif
// Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK, // Tests fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK,
// but with the browser initiated in fullscreen mode first. // but with the browser initiated in fullscreen mode first.
IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest,
BrowserFullscreenMouseLockContentSettings) { MAYBE_BrowserFullscreenMouseLockContentSettings) {
// Enter browser fullscreen first. // Enter browser fullscreen first.
ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true));
TestFullscreenMouseLockContentSettings(); TestFullscreenMouseLockContentSettings();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment