Index: apps/app_window_browsertest.cc |
diff --git a/apps/app_window_browsertest.cc b/apps/app_window_browsertest.cc |
index cc411551ceb908cf440f5a0f220ffb49b677b6af..4c417c780373f85755e62795b9ad2b0244523ba8 100644 |
--- a/apps/app_window_browsertest.cc |
+++ b/apps/app_window_browsertest.cc |
@@ -13,7 +13,10 @@ namespace { |
typedef extensions::PlatformAppBrowserTest AppWindowBrowserTest; |
-#if defined(TOOLKIT_GTK) |
+// This test is disabled on Linux because of the unpredictable nature of native |
+// windows. We cannot assume that the window manager will insert any title bar |
+// at all, so the test may fail on certain window managers. |
+#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
#define MAYBE_FrameInsetsForDefaultFrame DISABLED_FrameInsetsForDefaultFrame |
#else |
#define MAYBE_FrameInsetsForDefaultFrame FrameInsetsForDefaultFrame |
@@ -33,7 +36,10 @@ IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForDefaultFrame) { |
CloseAppWindow(app_window); |
} |
-#if defined(TOOLKIT_GTK) |
+// This test is also disabled on Linux because frame: color is ignored on stable |
+// and beta channels (so it can fail the same as the previous test). |
+// TODO(benwells): Re-enable on Linux after frame: color is on stable. |
+#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
#define MAYBE_FrameInsetsForColoredFrame DISABLED_FrameInsetsForColoredFrame |
#else |
#define MAYBE_FrameInsetsForColoredFrame FrameInsetsForColoredFrame |