Fix ServiceWorkerPushMessagingTest.OnPush.

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 679 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
-// 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) {
+IN_PROC_BROWSER_TEST_F(ServiceWorkerPushMessagingTest, OnPush) {
   const Extension* extension = LoadExtensionWithFlags(
       test_data_dir_.AppendASCII("service_worker/push_messaging"), kFlagNone);
   ASSERT_TRUE(extension);
   GURL extension_url = extension->url();
 
   ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest(extension_url));
 
   GURL url = extension->GetResourceURL("page.html");
   ui_test_utils::NavigateToURL(browser(), url);
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // Start the ServiceWorker.
   ExtensionTestMessageListener ready_listener("SERVICE_WORKER_READY", false);
   ready_listener.set_failure_message("SERVICE_WORKER_FAILURE");
   const char* kScript = "window.runServiceWorker()";
   EXPECT_TRUE(content::ExecuteScript(web_contents->GetMainFrame(), kScript));
   EXPECT_TRUE(ready_listener.WaitUntilSatisfied());
 
   PushMessagingAppIdentifier app_identifier =
       GetAppIdentifierForServiceWorkerRegistration(0LL, extension_url);
   ASSERT_EQ(app_identifier.app_id(), gcm_service()->last_registered_app_id());
   EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
 
+  base::RunLoop run_loop;
   // Send a push message via gcm and expect the ServiceWorker to receive it.
   ExtensionTestMessageListener push_message_listener("OK", false);
   push_message_listener.set_failure_message("FAIL");
   gcm::IncomingMessage message;
   message.sender_id = "1234567890";
   message.raw_data = "testdata";
   message.decrypted = true;
+  push_service()->SetMessageCallbackForTesting(run_loop.QuitClosure());
   push_service()->OnMessage(app_identifier.app_id(), message);
   EXPECT_TRUE(push_message_listener.WaitUntilSatisfied());
+  run_loop.Run();  // Wait until the message is handled by push service.
 }
 
 }  // namespace extensions