| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_data_fetcher.h" | 5 #include "chrome/browser/banners/app_banner_data_fetcher.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 #else | 160 #else |
| 161 #define MAYBE_WebAppBannerCreatedDirectLargerTotal WebAppBannerCreatedDirectLarg
erTotal | 161 #define MAYBE_WebAppBannerCreatedDirectLargerTotal WebAppBannerCreatedDirectLarg
erTotal |
| 162 #endif | 162 #endif |
| 163 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 163 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 164 MAYBE_WebAppBannerCreatedDirectLargerTotal) { | 164 MAYBE_WebAppBannerCreatedDirectLargerTotal) { |
| 165 AppBannerSettingsHelper::SetTotalEngagementToTrigger(4); | 165 AppBannerSettingsHelper::SetTotalEngagementToTrigger(4); |
| 166 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, | 166 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, |
| 167 3, true); | 167 3, true); |
| 168 } | 168 } |
| 169 | 169 |
| 170 // http://crbug.com/631190 |
| 171 #if defined(OS_WIN) |
| 172 #define MAYBE_WebAppBannerCreatedDirectSmallerTotal DISABLED_WebAppBannerCreated
DirectSmallerTotal |
| 173 #else |
| 174 #define MAYBE_WebAppBannerCreatedDirectSmallerTotal WebAppBannerCreatedDirectSma
llerTotal |
| 175 #endif |
| 170 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 176 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 171 WebAppBannerCreatedDirectSmallerTotal) { | 177 MAYBE_WebAppBannerCreatedDirectSmallerTotal) { |
| 172 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); | 178 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); |
| 173 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, | 179 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, |
| 174 0, true); | 180 0, true); |
| 175 } | 181 } |
| 176 | 182 |
| 177 // http://crbug.com/631190 | 183 // http://crbug.com/631190 |
| 178 #if defined(OS_WIN) | 184 #if defined(OS_WIN) |
| 179 #define MAYBE_WebAppBannerCreatedDirectSingle DISABLED_WebAppBannerCreatedDirect
Single | 185 #define MAYBE_WebAppBannerCreatedDirectSingle DISABLED_WebAppBannerCreatedDirect
Single |
| 180 #else | 186 #else |
| 181 #define MAYBE_WebAppBannerCreatedDirectSingle WebAppBannerCreatedDirectSingle | 187 #define MAYBE_WebAppBannerCreatedDirectSingle WebAppBannerCreatedDirectSingle |
| (...skipping 25 matching lines...) Expand all Loading... |
| 207 #define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal WebAppBannerCreatedDi
rectMultipleLargerTotal | 213 #define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal WebAppBannerCreatedDi
rectMultipleLargerTotal |
| 208 #endif | 214 #endif |
| 209 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 215 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 210 MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal) { | 216 MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal) { |
| 211 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); | 217 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); |
| 212 AppBannerSettingsHelper::SetTotalEngagementToTrigger(3); | 218 AppBannerSettingsHelper::SetTotalEngagementToTrigger(3); |
| 213 RunBannerTest("/banners/manifest_test_page.html", | 219 RunBannerTest("/banners/manifest_test_page.html", |
| 214 ui::PAGE_TRANSITION_GENERATED, 5, true); | 220 ui::PAGE_TRANSITION_GENERATED, 5, true); |
| 215 } | 221 } |
| 216 | 222 |
| 223 // http://crbug.com/631190 |
| 224 #if defined(OS_WIN) |
| 225 #define MAYBE_WebAppBannerCreatedDirectMultipleSmallerTotal DISABLED_WebAppBanne
rCreatedDirectMultipleSmallerTotal |
| 226 #else |
| 227 #define MAYBE_WebAppBannerCreatedDirectMultipleSmallerTotal WebAppBannerCreatedD
irectMultipleSmallerTotal |
| 228 #endif |
| 217 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 229 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 218 WebAppBannerCreatedDirectMultipleSmallerTotal) { | 230 MAYBE_WebAppBannerCreatedDirectMultipleSmallerTotal) { |
| 219 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); | 231 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); |
| 220 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); | 232 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); |
| 221 RunBannerTest("/banners/manifest_test_page.html", | 233 RunBannerTest("/banners/manifest_test_page.html", |
| 222 ui::PAGE_TRANSITION_GENERATED, 1, true); | 234 ui::PAGE_TRANSITION_GENERATED, 1, true); |
| 223 } | 235 } |
| 224 | 236 |
| 225 // http://crbug.com/631190 | 237 // http://crbug.com/631190 |
| 226 #if defined(OS_WIN) | 238 #if defined(OS_WIN) |
| 227 #define MAYBE_WebAppBannerCreatedIndirect DISABLED_WebAppBannerCreatedIndirect | 239 #define MAYBE_WebAppBannerCreatedIndirect DISABLED_WebAppBannerCreatedIndirect |
| 228 #else | 240 #else |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 #define MAYBE_CancelBannerDirect DISABLED_CancelBannerDirect | 421 #define MAYBE_CancelBannerDirect DISABLED_CancelBannerDirect |
| 410 #else | 422 #else |
| 411 #define MAYBE_CancelBannerDirect CancelBannerDirect | 423 #define MAYBE_CancelBannerDirect CancelBannerDirect |
| 412 #endif | 424 #endif |
| 413 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 425 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 414 MAYBE_CancelBannerDirect) { | 426 MAYBE_CancelBannerDirect) { |
| 415 RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, | 427 RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, |
| 416 false); | 428 false); |
| 417 } | 429 } |
| 418 | 430 |
| 419 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, CancelBannerIndirect) { | 431 // http://crbug.com/631190 |
| 432 #if defined(OS_WIN) |
| 433 #define MAYBE_CancelBannerIndirect DISABLED_CancelBannerIndirect |
| 434 #else |
| 435 #define MAYBE_CancelBannerIndirect CancelBannerIndirect |
| 436 #endif |
| 437 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 438 MAYBE_CancelBannerIndirect) { |
| 420 AppBannerSettingsHelper::SetEngagementWeights(1, 0.5); | 439 AppBannerSettingsHelper::SetEngagementWeights(1, 0.5); |
| 421 RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 3, | 440 RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 3, |
| 422 false); | 441 false); |
| 423 } | 442 } |
| 424 | 443 |
| 425 // http://crbug.com/631190 | 444 // http://crbug.com/631190 |
| 426 #if defined(OS_WIN) | 445 #if defined(OS_WIN) |
| 427 #define MAYBE_PromptBanner DISABLED_PromptBanner | 446 #define MAYBE_PromptBanner DISABLED_PromptBanner |
| 428 #else | 447 #else |
| 429 #define MAYBE_PromptBanner PromptBanner | 448 #define MAYBE_PromptBanner PromptBanner |
| (...skipping 15 matching lines...) Expand all Loading... |
| 445 RunBannerTest("/banners/prompt_in_handler_test_page.html", | 464 RunBannerTest("/banners/prompt_in_handler_test_page.html", |
| 446 ui::PAGE_TRANSITION_TYPED, 1, true); | 465 ui::PAGE_TRANSITION_TYPED, 1, true); |
| 447 } | 466 } |
| 448 | 467 |
| 449 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, WebAppBannerInIFrame) { | 468 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, WebAppBannerInIFrame) { |
| 450 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, | 469 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, |
| 451 false); | 470 false); |
| 452 } | 471 } |
| 453 | 472 |
| 454 } // namespace banners | 473 } // namespace banners |
| OLD | NEW |