Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2938)

Unified Diff: chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc

Issue 10861003: Disable many tests failing on mac 10.7 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc
===================================================================
--- chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc (revision 152296)
+++ chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc (working copy)
@@ -80,7 +80,8 @@
}
// Times out sometimes on Linux. http://crbug.com/135115
-#if defined(OS_LINUX)
+// Mac: http://crbug.com/103912
+#if defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_EscapingMouseLockAndFullscreen \
DISABLED_EscapingMouseLockAndFullscreen
#else
@@ -202,7 +203,8 @@
}
// Times out sometimes on Linux. http://crbug.com/135115
-#if defined(OS_LINUX)
+// Mac: http://crbug.com/103912
+#if defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_MouseLockAndFullscreen DISABLED_MouseLockAndFullscreen
#else
#define MAYBE_MouseLockAndFullscreen MouseLockAndFullscreen
@@ -420,8 +422,9 @@
ASSERT_TRUE(IsMouseLocked());
}
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
// http://crbug.com/137486
+// mac: http://crbug.com/103912
#define ReloadExitsMouseLockAndFullscreen DISABLED_ReloadExitsMouseLockAndFullscreen
#endif
// Tests Mouse Lock and Fullscreen are exited upon reload.
« no previous file with comments | « chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698