Disable TestRestoreGeometryCacheChange on all platforms, as it also flakes on WinXP.

chrome/browser/apps/app_window_browsertest.cc

 // Copyright 2013 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 "apps/shell_window_geometry_cache.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
@@ skipping 97 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestRestore) {
   ASSERT_TRUE(RunAppWindowAPITest("testRestore")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestRestoreAfterClose) {
   ASSERT_TRUE(RunAppWindowAPITest("testRestoreAfterClose")) << message_;
 }
 
-// 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) {
+// Flaky failures on mac_rel and WinXP, see http://crbug.com/324915.
+IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_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
   // changed. When the change happens, the test will let the app know so it can
   // continue running.
   ExtensionTestMessageListener launched_listener("Launched", true);
 
   content::WindowedNotificationObserver app_loaded_observer(
       content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
       content::NotificationService::AllSources());
@@ skipping 21 matching lines @@
   geo_change_helper.WaitForEntirelyChanged();
 
   ResultCatcher catcher;
   geometry_listener.Reply("");
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 IN_PROC_BROWSER_TEST_F(AppWindowAPI, DISABLED_TestSizeConstraints) {
   ASSERT_TRUE(RunAppWindowAPITest("testSizeConstraints")) << message_;
 }