| Index: chrome/browser/banners/app_banner_manager_browsertest.cc
|
| diff --git a/chrome/browser/banners/app_banner_manager_browsertest.cc b/chrome/browser/banners/app_banner_manager_browsertest.cc
|
| index a869e168fd3c97a6174567697aa3343c67f8bf89..7324640e0af1237ec91f48d66140294652b10a57 100644
|
| --- a/chrome/browser/banners/app_banner_manager_browsertest.cc
|
| +++ b/chrome/browser/banners/app_banner_manager_browsertest.cc
|
| @@ -206,16 +206,8 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
|
| 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",
|
| @@ -265,16 +257,8 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
|
| 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,
|
|
|