| 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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 RunBannerTest("/banners/manifest_test_page.html", | 229 RunBannerTest("/banners/manifest_test_page.html", |
| 230 ui::PAGE_TRANSITION_GENERATED, 1, SHOWING_WEB_APP_BANNER, true); | 230 ui::PAGE_TRANSITION_GENERATED, 1, SHOWING_WEB_APP_BANNER, true); |
| 231 } | 231 } |
| 232 | 232 |
| 233 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, | 233 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, |
| 234 WebAppBannerCreatedIndirect) { | 234 WebAppBannerCreatedIndirect) { |
| 235 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, 1, | 235 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, 1, |
| 236 SHOWING_WEB_APP_BANNER, true); | 236 SHOWING_WEB_APP_BANNER, true); |
| 237 } | 237 } |
| 238 | 238 |
| 239 // Flaky http://crbug.com/660798 |
| 239 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, | 240 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, |
| 240 WebAppBannerCreatedIndirectLargerTotal) { | 241 DISABLED_WebAppBannerCreatedIndirectLargerTotal) { |
| 241 AppBannerSettingsHelper::SetTotalEngagementToTrigger(5); | 242 AppBannerSettingsHelper::SetTotalEngagementToTrigger(5); |
| 242 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, 4, | 243 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, 4, |
| 243 SHOWING_WEB_APP_BANNER, true); | 244 SHOWING_WEB_APP_BANNER, true); |
| 244 } | 245 } |
| 245 | 246 |
| 246 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, | 247 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, |
| 247 WebAppBannerCreatedIndirectSmallerTotal) { | 248 WebAppBannerCreatedIndirectSmallerTotal) { |
| 248 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); | 249 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); |
| 249 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, 0, | 250 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, 0, |
| 250 SHOWING_WEB_APP_BANNER, true); | 251 SHOWING_WEB_APP_BANNER, true); |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 RunBannerTest("/banners/prompt_in_handler_test_page.html", | 404 RunBannerTest("/banners/prompt_in_handler_test_page.html", |
| 404 ui::PAGE_TRANSITION_TYPED, 1, SHOWING_WEB_APP_BANNER, true); | 405 ui::PAGE_TRANSITION_TYPED, 1, SHOWING_WEB_APP_BANNER, true); |
| 405 } | 406 } |
| 406 | 407 |
| 407 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerInIFrame) { | 408 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerInIFrame) { |
| 408 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 0, | 409 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 0, |
| 409 NO_MANIFEST, false); | 410 NO_MANIFEST, false); |
| 410 } | 411 } |
| 411 | 412 |
| 412 } // namespace banners | 413 } // namespace banners |
| OLD | NEW |