Index: extensions/shell/browser/shell_browsertest.cc |
diff --git a/extensions/shell/browser/shell_browsertest.cc b/extensions/shell/browser/shell_browsertest.cc |
index baf75d9f712243084a201aa9655871c52a371e12..93e6b39d5f84b941e83d51266a4b2785f7538a37 100644 |
--- a/extensions/shell/browser/shell_browsertest.cc |
+++ b/extensions/shell/browser/shell_browsertest.cc |
@@ -17,8 +17,14 @@ |
namespace extensions { |
+// Flaky on linux. See http://crbug.com/470873. |
+#if defined(OS_LINUX) |
+#define MAYBE_Basic DISABLED_Basic |
+#else |
+#define MAYBE_Basic Basic |
+#endif |
// Test that we can open an app window and wait for it to load. |
-IN_PROC_BROWSER_TEST_F(ShellApiTest, Basic) { |
+IN_PROC_BROWSER_TEST_F(ShellApiTest, MAYBE_Basic) { |
ASSERT_TRUE(RunAppTest("platform_app")) << message_; |
// A window was created. |