Re-enable AppBannerManagerBrowserTests.

chrome/browser/banners/app_banner_manager_browsertest.cc

 // Copyright 2016 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_manager.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner.h"
@@ skipping 188 matching lines @@
                 ui::PAGE_TRANSITION_GENERATED, 0, SHOWING_WEB_APP_BANNER, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
                        WebAppBannerCreatedDirectMultiple) {
   AppBannerSettingsHelper::SetEngagementWeights(0.5, 1);
   RunBannerTest("/banners/manifest_test_page.html",
                 ui::PAGE_TRANSITION_GENERATED, 3, SHOWING_WEB_APP_BANNER, true);
 }
 
-// Disabled due to flakiness: crbug.com/661511.
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal \
-    DISABLED_WebAppBannerCreatedDirectMultipleLargerTotal
-#else
-#define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal \
-    WebAppBannerCreatedDirectMultipleLargerTotal
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
-                       MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal) {
+                       WebAppBannerCreatedDirectMultipleLargerTotal) {
   AppBannerSettingsHelper::SetEngagementWeights(0.5, 1);
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(3);
   RunBannerTest("/banners/manifest_test_page.html",
                 ui::PAGE_TRANSITION_GENERATED, 5, SHOWING_WEB_APP_BANNER, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
                        WebAppBannerCreatedDirectMultipleSmallerTotal) {
   AppBannerSettingsHelper::SetEngagementWeights(0.5, 1);
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(1);
@@ skipping 29 matching lines @@
                 0, SHOWING_WEB_APP_BANNER, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
                        WebAppBannerCreatedIndirectMultiple) {
   AppBannerSettingsHelper::SetEngagementWeights(1, 0.5);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, 3,
                 SHOWING_WEB_APP_BANNER, true);
 }
 
-// Disabled. See http://crbug.com/660798
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-#define MAYBE_WebAppBannerCreatedIndirectMultipleLargerTotal \
-  DISABLED_WebAppBannerCreatedIndirectMultipleLargerTotal
-#else
-#define MAYBE_WebAppBannerCreatedIndirectMultipleLargerTotal \
-  WebAppBannerCreatedIndirectMultipleLargerTotal
-#endif
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
-                       MAYBE_WebAppBannerCreatedIndirectMultipleLargerTotal) {
+                       WebAppBannerCreatedIndirectMultipleLargerTotal) {
   AppBannerSettingsHelper::SetEngagementWeights(1, 0.5);
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(4);
   RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, 7,
                 SHOWING_WEB_APP_BANNER, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
                        WebAppBannerCreatedVarious) {
   AppBannerSettingsHelper::SetEngagementWeights(0.5, 0.25);
 
@@ skipping 124 matching lines @@
   RunBannerTest("/banners/prompt_in_handler_test_page.html",
                 ui::PAGE_TRANSITION_TYPED, 1, SHOWING_WEB_APP_BANNER, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerInIFrame) {
   RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 0,
                 NO_MANIFEST, false);
 }
 
 }  // namespace banners