| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/banners/app_banner_manager.h" | 5 #include "chrome/browser/banners/app_banner_manager.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
| 10 #include "base/task_runner.h" | 10 #include "base/task_runner.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 ui::PAGE_TRANSITION_GENERATED, 0, SHOWING_WEB_APP_BANNER, true); | 199 ui::PAGE_TRANSITION_GENERATED, 0, SHOWING_WEB_APP_BANNER, true); |
| 200 } | 200 } |
| 201 | 201 |
| 202 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, | 202 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, |
| 203 WebAppBannerCreatedDirectMultiple) { | 203 WebAppBannerCreatedDirectMultiple) { |
| 204 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); | 204 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); |
| 205 RunBannerTest("/banners/manifest_test_page.html", | 205 RunBannerTest("/banners/manifest_test_page.html", |
| 206 ui::PAGE_TRANSITION_GENERATED, 3, SHOWING_WEB_APP_BANNER, true); | 206 ui::PAGE_TRANSITION_GENERATED, 3, SHOWING_WEB_APP_BANNER, true); |
| 207 } | 207 } |
| 208 | 208 |
| 209 // Disabled due to flakiness: crbug.com/661511. |
| 210 #if defined(OS_LINUX) || defined(OS_WIN) |
| 211 #define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal \ |
| 212 DISABLED_WebAppBannerCreatedDirectMultipleLargerTotal |
| 213 #else |
| 214 #define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal \ |
| 215 WebAppBannerCreatedDirectMultipleLargerTotal |
| 216 #endif |
| 209 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, | 217 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, |
| 210 WebAppBannerCreatedDirectMultipleLargerTotal) { | 218 MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal) { |
| 211 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); | 219 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); |
| 212 AppBannerSettingsHelper::SetTotalEngagementToTrigger(3); | 220 AppBannerSettingsHelper::SetTotalEngagementToTrigger(3); |
| 213 RunBannerTest("/banners/manifest_test_page.html", | 221 RunBannerTest("/banners/manifest_test_page.html", |
| 214 ui::PAGE_TRANSITION_GENERATED, 5, SHOWING_WEB_APP_BANNER, true); | 222 ui::PAGE_TRANSITION_GENERATED, 5, SHOWING_WEB_APP_BANNER, true); |
| 215 } | 223 } |
| 216 | 224 |
| 217 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, | 225 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, |
| 218 WebAppBannerCreatedDirectMultipleSmallerTotal) { | 226 WebAppBannerCreatedDirectMultipleSmallerTotal) { |
| 219 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); | 227 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); |
| 220 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); | 228 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 RunBannerTest("/banners/prompt_in_handler_test_page.html", | 403 RunBannerTest("/banners/prompt_in_handler_test_page.html", |
| 396 ui::PAGE_TRANSITION_TYPED, 1, SHOWING_WEB_APP_BANNER, true); | 404 ui::PAGE_TRANSITION_TYPED, 1, SHOWING_WEB_APP_BANNER, true); |
| 397 } | 405 } |
| 398 | 406 |
| 399 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerInIFrame) { | 407 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerInIFrame) { |
| 400 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 0, | 408 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 0, |
| 401 NO_MANIFEST, false); | 409 NO_MANIFEST, false); |
| 402 } | 410 } |
| 403 | 411 |
| 404 } // namespace banners | 412 } // namespace banners |
| OLD | NEW |