Disable ShellWindowRestorePosition due to flakiness.

chrome/browser/extensions/platform_app_browsertest.cc

Index: chrome/browser/extensions/platform_app_browsertest.cc
diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc
index 4e1037177cb22a26ca938b13e560b6ed51769655..da04fa9f134146e2638fc6b5ced568b4dbda4be2 100644
--- a/chrome/browser/extensions/platform_app_browsertest.cc
+++ b/chrome/browser/extensions/platform_app_browsertest.cc
@@ -607,9 +607,14 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MutationEventsDisabled) {
 
 // Test that windows created with an id will remember and restore their
 // geometry when opening new windows.
-// Flaky, see http://crbug.com/155459.
+// Disabled due to flakiness on linux, see http://crbug.com/155459.
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#define MAYBE_ShellWindowRestorePosition DISABLED_ShellWindowRestorePosition
+#else
+#define MAYBE_ShellWindowRestorePosition FLAKY_ShellWindowRestorePosition
+#endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
-                       FLAKY_ShellWindowRestorePosition) {
+                       MAYBE_ShellWindowRestorePosition) {
   ExtensionTestMessageListener page2_listener("WaitForPage2", true);
   ExtensionTestMessageListener page3_listener("WaitForPage3", true);
   ExtensionTestMessageListener done_listener("Done1", false);