Revert of Disable Many 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 124 matching lines @@
     ui_test_utils::NavigateToURL(browser(), test_url);
     RunFetcher(web_contents->GetURL(), std::string(), transition, expectation);
   }
 
  private:
   std::string non_web_platform_;
   base::Closure quit_closure_;
   base::WeakPtrFactory<AppBannerDataFetcherBrowserTest> weak_factory_;
 };
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedDirect DISABLED_WebAppBannerCreatedDirect
-#else
-#define MAYBE_WebAppBannerCreatedDirect WebAppBannerCreatedDirect
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedDirect) {
+                       WebAppBannerCreatedDirect) {
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED,
                 1, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedDirectLargerTotal DISABLED_WebAppBannerCreatedDirectLargerTotal
-#else
-#define MAYBE_WebAppBannerCreatedDirectLargerTotal WebAppBannerCreatedDirectLargerTotal
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedDirectLargerTotal) {
+                       WebAppBannerCreatedDirectLargerTotal) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(4);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED,
                 3, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
                        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
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedDirectSingle) {
+                       WebAppBannerCreatedDirectSingle) {
   AppBannerSettingsHelper::SetEngagementWeights(2, 1);
   RunBannerTest("/banners/manifest_test_page.html",
                 ui::PAGE_TRANSITION_GENERATED, 0, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedDirectMultiple DISABLED_WebAppBannerCreatedDirectMultiple
-#else
-#define MAYBE_WebAppBannerCreatedDirectMultiple WebAppBannerCreatedDirectMultiple
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedDirectMultiple) {
+                       WebAppBannerCreatedDirectMultiple) {
   AppBannerSettingsHelper::SetEngagementWeights(0.5, 1);
   RunBannerTest("/banners/manifest_test_page.html",
                 ui::PAGE_TRANSITION_GENERATED, 3, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal DISABLED_WebAppBannerCreatedDirectMultipleLargerTotal
-#else
-#define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal WebAppBannerCreatedDirectMultipleLargerTotal
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal) {
+                       WebAppBannerCreatedDirectMultipleLargerTotal) {
   AppBannerSettingsHelper::SetEngagementWeights(0.5, 1);
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(3);
   RunBannerTest("/banners/manifest_test_page.html",
                 ui::PAGE_TRANSITION_GENERATED, 5, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
                        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
-#define MAYBE_WebAppBannerCreatedIndirect WebAppBannerCreatedIndirect
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedIndirect) {
+                       WebAppBannerCreatedIndirect) {
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK,
                 1, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedIndirectLargerTotal DISABLED_WebAppBannerCreatedIndirectLargerTotal
-#else
-#define MAYBE_WebAppBannerCreatedIndirectLargerTotal WebAppBannerCreatedIndirectLargerTotal
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedIndirectLargerTotal) {
+                       WebAppBannerCreatedIndirectLargerTotal) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(5);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK,
                 4, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedIndirectSmallerTotal DISABLED_WebAppBannerCreatedIndirectSmallerTotal
-#else
-#define MAYBE_WebAppBannerCreatedIndirectSmallerTotal WebAppBannerCreatedIndirectSmallerTotal
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedIndirectSmallerTotal) {
+                       WebAppBannerCreatedIndirectSmallerTotal) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(1);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK,
                 0, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedIndirectSingle DISABLED_WebAppBannerCreatedIndirectSingle
-#else
-#define MAYBE_WebAppBannerCreatedIndirectSingle WebAppBannerCreatedIndirectSingle
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedIndirectSingle) {
+                       WebAppBannerCreatedIndirectSingle) {
   AppBannerSettingsHelper::SetEngagementWeights(1, 3);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_RELOAD,
                 0, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedIndirectMultiple DISABLED_WebAppBannerCreatedIndirectMultiple
-#else
-#define MAYBE_WebAppBannerCreatedIndirectMultiple WebAppBannerCreatedIndirectMultiple
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedIndirectMultiple) {
+                       WebAppBannerCreatedIndirectMultiple) {
   AppBannerSettingsHelper::SetEngagementWeights(1, 0.5);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK,
                 3, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedIndirectMultipleLargerTotal DISABLED_WebAppBannerCreatedIndirectMultipleLargerTotal
-#else
-#define MAYBE_WebAppBannerCreatedIndirectMultipleLargerTotal WebAppBannerCreatedIndirectMultipleLargerTotal
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedIndirectMultipleLargerTotal) {
+                       WebAppBannerCreatedIndirectMultipleLargerTotal) {
   AppBannerSettingsHelper::SetEngagementWeights(1, 0.5);
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(4);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK,
                 7, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedVarious DISABLED_WebAppBannerCreatedVarious
-#else
-#define MAYBE_WebAppBannerCreatedVarious WebAppBannerCreatedVarious
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerCreatedVarious) {
+                       WebAppBannerCreatedVarious) {
   AppBannerSettingsHelper::SetEngagementWeights(0.5, 0.25);
 
   std::string valid_page("/banners/manifest_test_page.html");
   GURL test_url = embedded_test_server()->GetURL(valid_page);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // Add a direct nav on day 1.
   ui_test_utils::NavigateToURL(browser(), test_url);
   RunFetcher(web_contents->GetURL(), std::string(), ui::PAGE_TRANSITION_TYPED,
@@ skipping 26 matching lines @@
   ui_test_utils::NavigateToURL(browser(), test_url);
   RunFetcher(web_contents->GetURL(), std::string(),
              ui::PAGE_TRANSITION_FORM_SUBMIT, false);
 
   // Add a direct nav on day 4 which should trigger the banner.
   ui_test_utils::NavigateToURL(browser(), test_url);
   RunFetcher(web_contents->GetURL(), std::string(),
              ui::PAGE_TRANSITION_TYPED, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerNoTypeInManifest DISABLED_WebAppBannerNoTypeInManifest
-#else
-#define MAYBE_WebAppBannerNoTypeInManifest WebAppBannerNoTypeInManifest
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerNoTypeInManifest) {
+                       WebAppBannerNoTypeInManifest) {
   RunBannerTest("/banners/manifest_no_type_test_page.html",
                 ui::PAGE_TRANSITION_TYPED, 1, true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_WebAppBannerNoTypeInManifestCapsExtension DISABLED_WebAppBannerNoTypeInManifestCapsExtension
-#else
-#define MAYBE_WebAppBannerNoTypeInManifestCapsExtension WebAppBannerNoTypeInManifestCapsExtension
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_WebAppBannerNoTypeInManifestCapsExtension) {
+                       WebAppBannerNoTypeInManifestCapsExtension) {
   RunBannerTest("/banners/manifest_no_type_caps_test_page.html",
                 ui::PAGE_TRANSITION_TYPED, 1, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, PlayAppManifest) {
   std::string valid_page("/banners/play_app_test_page.html");
   GURL test_url = embedded_test_server()->GetURL(valid_page);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
@@ skipping 10 matching lines @@
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, NoManifest) {
   RunBannerTest("/banners/no_manifest_test_page.html",
                 ui::PAGE_TRANSITION_TYPED, 1, false);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, MissingManifest) {
   RunBannerTest("/banners/manifest_bad_link.html",
                 ui::PAGE_TRANSITION_TYPED, 1, false);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_CancelBannerDirect DISABLED_CancelBannerDirect
-#else
-#define MAYBE_CancelBannerDirect CancelBannerDirect
-#endif
-IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_CancelBannerDirect) {
+IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, CancelBannerDirect) {
   RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 1,
                 false);
 }
 
 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
-#endif
-IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_PromptBanner) {
+IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, PromptBanner) {
   RunBannerTest("/banners/prompt_test_page.html", ui::PAGE_TRANSITION_TYPED, 1,
                 true);
 }
 
-// http://crbug.com/631190
-#if defined(OS_WIN)
-#define MAYBE_PromptBannerInHandler DISABLED_PromptBannerInHandler
-#else
-#define MAYBE_PromptBannerInHandler PromptBannerInHandler
-#endif
-IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
-                       MAYBE_PromptBannerInHandler) {
+IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, PromptBannerInHandler) {
   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