Fix flaky SW registration in PushMessaging/BudgetManager browser tests

chrome/browser/push_messaging/push_messaging_browsertest.cc

Index: chrome/browser/push_messaging/push_messaging_browsertest.cc
diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc
index 1b93619e3d410f9c865aa2c419866be95fdc5b3b..e4c5b538533d605a2d6f1858f2be1323068c2a2c 100644
--- a/chrome/browser/push_messaging/push_messaging_browsertest.cc
+++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc
@@ -511,13 +511,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTestEmptySubscriptionOptions,
             script_result);
 }
 
-// Flaky on ChromeOS and Linux. See http://crbug.com/657202.
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-#define MAYBE_SubscribeWorker DISABLED_SubscribeWorker
-#else
-#define MAYBE_SubscribeWorker SubscribeWorker
-#endif
-IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, MAYBE_SubscribeWorker) {
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeWorker) {
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
@@ -560,14 +554,8 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, MAYBE_SubscribeWorker) {
   EXPECT_NE(push_service(), GetAppHandler());
 }
 
-// Flaky on ChromeOS and Linux. See http://crbug.com/657202.
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-#define MAYBE_SubscribeWorkerUsingManifest DISABLED_SubscribeWorkerUsingManifest
-#else
-#define MAYBE_SubscribeWorkerUsingManifest SubscribeWorkerUsingManifest
-#endif
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
-                       MAYBE_SubscribeWorkerUsingManifest) {
+                       SubscribeWorkerUsingManifest) {
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
@@ -613,13 +601,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
   EXPECT_NE(push_service(), GetAppHandler());
 }
 
-// Disabled on Windows and Linux due to flakiness (http://crbug.com/554003).
-#if defined(OS_WIN) || defined(OS_LINUX)
-#define MAYBE_SubscribePersisted DISABLED_SubscribePersisted
-#else
-#define MAYBE_SubscribePersisted SubscribePersisted
-#endif
-IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, MAYBE_SubscribePersisted) {
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribePersisted) {
   std::string script_result;
 
   // First, test that Service Worker registration IDs are assigned in order of