Disable flaky ServiceWorkerPushMessagingTest.OnPush test on Windows

chrome/browser/extensions/service_worker_apitest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 680 matching lines @@
   std::string value;
   ASSERT_TRUE(
       content::ExecuteScriptAndExtractString(tab, "register();", &value));
   EXPECT_EQ("SW controlled", value);
 
   ASSERT_TRUE(RunExtensionTest("service_worker/content_script_fetch"))
       << message_;
 }
 
 // Flaky on ChromiumOS bots. http://crbug.com/612673
-#if defined(OS_CHROMEOS)
+// Flaky on Windows bots. http://crbug.com/612840
+#if defined(OS_CHROMEOS) || defined(OS_WIN)
 #define MAYBE_OnPush DISABLED_OnPush
 #else
 #define MAYBE_OnPush OnPush
 #endif
 IN_PROC_BROWSER_TEST_F(ServiceWorkerPushMessagingTest, MAYBE_OnPush) {
   const Extension* extension = LoadExtensionWithFlags(
       test_data_dir_.AppendASCII("service_worker/push_messaging"), kFlagNone);
   ASSERT_TRUE(extension);
   GURL extension_url = extension->url();
 
@@ skipping 22 matching lines @@
   push_message_listener.set_failure_message("FAIL");
   gcm::IncomingMessage message;
   message.sender_id = "1234567890";
   message.raw_data = "testdata";
   message.decrypted = true;
   push_service()->OnMessage(app_identifier.app_id(), message);
   EXPECT_TRUE(push_message_listener.WaitUntilSatisfied());
 }
 
 }  // namespace extensions