Revert of Disable A Few More AppBannerDataFetcherBrowserTest Failing Tests

chrome/browser/banners/app_banner_data_fetcher_browsertest.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 "chrome/browser/banners/app_banner_data_fetcher.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 149 matching lines @@
 #else
 #define MAYBE_WebAppBannerCreatedDirectLargerTotal WebAppBannerCreatedDirectLargerTotal
 #endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
                        MAYBE_WebAppBannerCreatedDirectLargerTotal) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(4);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED,
                 3, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedDirectSmallerTotal DISABLED_WebAppBannerCreatedDirectSmallerTotal
-#else
-#define MAYBE_WebAppBannerCreatedDirectSmallerTotal WebAppBannerCreatedDirectSmallerTotal
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedDirectSmallerTotal) {
+                       WebAppBannerCreatedDirectSmallerTotal) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(1);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED,
                 0, true);
 }
 
 // http://crbug.com/631190
 #if defined(OS_WIN)
 #define MAYBE_WebAppBannerCreatedDirectSingle DISABLED_WebAppBannerCreatedDirectSingle
 #else
 #define MAYBE_WebAppBannerCreatedDirectSingle WebAppBannerCreatedDirectSingle
@@ skipping 25 matching lines @@
 #define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal WebAppBannerCreatedDirectMultipleLargerTotal
 #endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
                        MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal) {
   AppBannerSettingsHelper::SetEngagementWeights(0.5, 1);
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(3);
   RunBannerTest("/banners/manifest_test_page.html",
                 ui::PAGE_TRANSITION_GENERATED, 5, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedDirectMultipleSmallerTotal DISABLED_WebAppBannerCreatedDirectMultipleSmallerTotal
-#else
-#define MAYBE_WebAppBannerCreatedDirectMultipleSmallerTotal WebAppBannerCreatedDirectMultipleSmallerTotal
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedDirectMultipleSmallerTotal) {
+                       WebAppBannerCreatedDirectMultipleSmallerTotal) {
   AppBannerSettingsHelper::SetEngagementWeights(0.5, 1);
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(1);
   RunBannerTest("/banners/manifest_test_page.html",
                 ui::PAGE_TRANSITION_GENERATED, 1, true);
 }
 
 // http://crbug.com/631190
 #if defined(OS_WIN)
 #define MAYBE_WebAppBannerCreatedIndirect DISABLED_WebAppBannerCreatedIndirect
 #else
@@ skipping 180 matching lines @@
 #define MAYBE_CancelBannerDirect DISABLED_CancelBannerDirect
 #else
 #define MAYBE_CancelBannerDirect CancelBannerDirect
 #endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
                        MAYBE_CancelBannerDirect) {
   RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 1,
                 false);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_CancelBannerIndirect DISABLED_CancelBannerIndirect
-#else
-#define MAYBE_CancelBannerIndirect CancelBannerIndirect
-#endif
-IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_CancelBannerIndirect) {
+IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, CancelBannerIndirect) {
   AppBannerSettingsHelper::SetEngagementWeights(1, 0.5);
   RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 3,
                 false);
 }
 
 // http://crbug.com/631190
 #if defined(OS_WIN)
 #define MAYBE_PromptBanner DISABLED_PromptBanner
 #else
 #define MAYBE_PromptBanner PromptBanner
@@ skipping 15 matching lines @@
   RunBannerTest("/banners/prompt_in_handler_test_page.html",
                 ui::PAGE_TRANSITION_TYPED, 1, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, WebAppBannerInIFrame) {
   RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 1,
                 false);
 }
 
 }  // namespace banners