summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/apps/app_window_browsertest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/apps/app_window_browsertest.cc b/chrome/browser/apps/app_window_browsertest.cc
index 383e2a5..69b82bab 100644
--- a/chrome/browser/apps/app_window_browsertest.cc
+++ b/chrome/browser/apps/app_window_browsertest.cc
@@ -115,7 +115,13 @@ IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestRestoreAfterClose) {
ASSERT_TRUE(RunAppWindowAPITest("testRestoreAfterClose")) << message_;
}
-IN_PROC_BROWSER_TEST_F(AppWindowAPI, TestRestoreGeometryCacheChange) {
+// Flaky failures on mac_rel, see http://crbug.com/324915
+#if defined(OS_MACOSX)
+#define MAYBE_TestRestoreGeometryCacheChange DISABLED_TestRestoreGeometryCacheChange
+#else
+#define MAYBE_TestRestoreGeometryCacheChange TestRestoreGeometryCacheChange
+#endif
+IN_PROC_BROWSER_TEST_F(AppWindowAPI, MAYBE_TestRestoreGeometryCacheChange) {
// This test is similar to the other AppWindowAPI tests except that at some
// point the app will send a 'ListenGeometryChange' message at which point the
// test will check if the geometry cache entry for the test window has