Disable ShellWindowRestorePosition due to flakiness.

chrome/browser/extensions/platform_app_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/automation_util.h"
@@ skipping 589 matching lines @@
   observer.Wait();
   ASSERT_EQ(2, browser()->tab_count());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MutationEventsDisabled) {
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/mutation_events")) << message_;
 }
 
 // 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);
   ExtensionTestMessageListener done2_listener("Done2", false);
   ExtensionTestMessageListener done3_listener("Done3", false);
 
   ASSERT_TRUE(LoadAndLaunchPlatformApp("geometry"));
 
   // Wait for the app to be launched (although this is mostly to have a
   // message to reply to to let the script know it should create its second
@@ skipping 192 matching lines @@
   ASSERT_TRUE(GetFirstShellWindow());
 
   // Now tell the app to reload itself
   ExtensionTestMessageListener launched_listener2("Launched", false);
   launched_listener.Reply("reload");
   ASSERT_TRUE(launched_listener2.WaitUntilSatisfied());
   ASSERT_TRUE(GetFirstShellWindow());
 }
 
 }  // namespace extensions