| 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 ui_test_utils::NavigateToURL(browser(), test_url); | 135 ui_test_utils::NavigateToURL(browser(), test_url); |
| 136 RunFetcher(web_contents->GetURL(), std::string(), transition, expectation); | 136 RunFetcher(web_contents->GetURL(), std::string(), transition, expectation); |
| 137 } | 137 } |
| 138 | 138 |
| 139 private: | 139 private: |
| 140 std::string non_web_platform_; | 140 std::string non_web_platform_; |
| 141 base::Closure quit_closure_; | 141 base::Closure quit_closure_; |
| 142 base::WeakPtrFactory<AppBannerDataFetcherBrowserTest> weak_factory_; | 142 base::WeakPtrFactory<AppBannerDataFetcherBrowserTest> weak_factory_; |
| 143 }; | 143 }; |
| 144 | 144 |
| 145 // http://crbug.com/631190 |
| 146 #if defined(OS_WIN) |
| 147 #define MAYBE_WebAppBannerCreatedDirect DISABLED_WebAppBannerCreatedDirect |
| 148 #else |
| 149 #define MAYBE_WebAppBannerCreatedDirect WebAppBannerCreatedDirect |
| 150 #endif |
| 145 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 151 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 146 WebAppBannerCreatedDirect) { | 152 MAYBE_WebAppBannerCreatedDirect) { |
| 147 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, | 153 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, |
| 148 1, true); | 154 1, true); |
| 149 } | 155 } |
| 150 | 156 |
| 157 // http://crbug.com/631190 |
| 158 #if defined(OS_WIN) |
| 159 #define MAYBE_WebAppBannerCreatedDirectLargerTotal DISABLED_WebAppBannerCreatedD
irectLargerTotal |
| 160 #else |
| 161 #define MAYBE_WebAppBannerCreatedDirectLargerTotal WebAppBannerCreatedDirectLarg
erTotal |
| 162 #endif |
| 151 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 163 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 152 WebAppBannerCreatedDirectLargerTotal) { | 164 MAYBE_WebAppBannerCreatedDirectLargerTotal) { |
| 153 AppBannerSettingsHelper::SetTotalEngagementToTrigger(4); | 165 AppBannerSettingsHelper::SetTotalEngagementToTrigger(4); |
| 154 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, | 166 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, |
| 155 3, true); | 167 3, true); |
| 156 } | 168 } |
| 157 | 169 |
| 158 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 170 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 159 WebAppBannerCreatedDirectSmallerTotal) { | 171 WebAppBannerCreatedDirectSmallerTotal) { |
| 160 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); | 172 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); |
| 161 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, | 173 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_TYPED, |
| 162 0, true); | 174 0, true); |
| 163 } | 175 } |
| 164 | 176 |
| 177 // http://crbug.com/631190 |
| 178 #if defined(OS_WIN) |
| 179 #define MAYBE_WebAppBannerCreatedDirectSingle DISABLED_WebAppBannerCreatedDirect
Single |
| 180 #else |
| 181 #define MAYBE_WebAppBannerCreatedDirectSingle WebAppBannerCreatedDirectSingle |
| 182 #endif |
| 165 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 183 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 166 WebAppBannerCreatedDirectSingle) { | 184 MAYBE_WebAppBannerCreatedDirectSingle) { |
| 167 AppBannerSettingsHelper::SetEngagementWeights(2, 1); | 185 AppBannerSettingsHelper::SetEngagementWeights(2, 1); |
| 168 RunBannerTest("/banners/manifest_test_page.html", | 186 RunBannerTest("/banners/manifest_test_page.html", |
| 169 ui::PAGE_TRANSITION_GENERATED, 0, true); | 187 ui::PAGE_TRANSITION_GENERATED, 0, true); |
| 170 } | 188 } |
| 171 | 189 |
| 190 // http://crbug.com/631190 |
| 191 #if defined(OS_WIN) |
| 192 #define MAYBE_WebAppBannerCreatedDirectMultiple DISABLED_WebAppBannerCreatedDire
ctMultiple |
| 193 #else |
| 194 #define MAYBE_WebAppBannerCreatedDirectMultiple WebAppBannerCreatedDirectMultipl
e |
| 195 #endif |
| 172 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 196 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 173 WebAppBannerCreatedDirectMultiple) { | 197 MAYBE_WebAppBannerCreatedDirectMultiple) { |
| 174 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); | 198 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); |
| 175 RunBannerTest("/banners/manifest_test_page.html", | 199 RunBannerTest("/banners/manifest_test_page.html", |
| 176 ui::PAGE_TRANSITION_GENERATED, 3, true); | 200 ui::PAGE_TRANSITION_GENERATED, 3, true); |
| 177 } | 201 } |
| 178 | 202 |
| 203 // http://crbug.com/631190 |
| 204 #if defined(OS_WIN) |
| 205 #define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal DISABLED_WebAppBanner
CreatedDirectMultipleLargerTotal |
| 206 #else |
| 207 #define MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal WebAppBannerCreatedDi
rectMultipleLargerTotal |
| 208 #endif |
| 179 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 209 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 180 WebAppBannerCreatedDirectMultipleLargerTotal) { | 210 MAYBE_WebAppBannerCreatedDirectMultipleLargerTotal) { |
| 181 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); | 211 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); |
| 182 AppBannerSettingsHelper::SetTotalEngagementToTrigger(3); | 212 AppBannerSettingsHelper::SetTotalEngagementToTrigger(3); |
| 183 RunBannerTest("/banners/manifest_test_page.html", | 213 RunBannerTest("/banners/manifest_test_page.html", |
| 184 ui::PAGE_TRANSITION_GENERATED, 5, true); | 214 ui::PAGE_TRANSITION_GENERATED, 5, true); |
| 185 } | 215 } |
| 186 | 216 |
| 187 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 217 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 188 WebAppBannerCreatedDirectMultipleSmallerTotal) { | 218 WebAppBannerCreatedDirectMultipleSmallerTotal) { |
| 189 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); | 219 AppBannerSettingsHelper::SetEngagementWeights(0.5, 1); |
| 190 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); | 220 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); |
| 191 RunBannerTest("/banners/manifest_test_page.html", | 221 RunBannerTest("/banners/manifest_test_page.html", |
| 192 ui::PAGE_TRANSITION_GENERATED, 1, true); | 222 ui::PAGE_TRANSITION_GENERATED, 1, true); |
| 193 } | 223 } |
| 194 | 224 |
| 225 // http://crbug.com/631190 |
| 226 #if defined(OS_WIN) |
| 227 #define MAYBE_WebAppBannerCreatedIndirect DISABLED_WebAppBannerCreatedIndirect |
| 228 #else |
| 229 #define MAYBE_WebAppBannerCreatedIndirect WebAppBannerCreatedIndirect |
| 230 #endif |
| 195 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 231 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 196 WebAppBannerCreatedIndirect) { | 232 MAYBE_WebAppBannerCreatedIndirect) { |
| 197 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, | 233 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, |
| 198 1, true); | 234 1, true); |
| 199 } | 235 } |
| 200 | 236 |
| 237 // http://crbug.com/631190 |
| 238 #if defined(OS_WIN) |
| 239 #define MAYBE_WebAppBannerCreatedIndirectLargerTotal DISABLED_WebAppBannerCreate
dIndirectLargerTotal |
| 240 #else |
| 241 #define MAYBE_WebAppBannerCreatedIndirectLargerTotal WebAppBannerCreatedIndirect
LargerTotal |
| 242 #endif |
| 201 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 243 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 202 WebAppBannerCreatedIndirectLargerTotal) { | 244 MAYBE_WebAppBannerCreatedIndirectLargerTotal) { |
| 203 AppBannerSettingsHelper::SetTotalEngagementToTrigger(5); | 245 AppBannerSettingsHelper::SetTotalEngagementToTrigger(5); |
| 204 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, | 246 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, |
| 205 4, true); | 247 4, true); |
| 206 } | 248 } |
| 207 | 249 |
| 250 // http://crbug.com/631190 |
| 251 #if defined(OS_WIN) |
| 252 #define MAYBE_WebAppBannerCreatedIndirectSmallerTotal DISABLED_WebAppBannerCreat
edIndirectSmallerTotal |
| 253 #else |
| 254 #define MAYBE_WebAppBannerCreatedIndirectSmallerTotal WebAppBannerCreatedIndirec
tSmallerTotal |
| 255 #endif |
| 208 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 256 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 209 WebAppBannerCreatedIndirectSmallerTotal) { | 257 MAYBE_WebAppBannerCreatedIndirectSmallerTotal) { |
| 210 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); | 258 AppBannerSettingsHelper::SetTotalEngagementToTrigger(1); |
| 211 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, | 259 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, |
| 212 0, true); | 260 0, true); |
| 213 } | 261 } |
| 214 | 262 |
| 263 // http://crbug.com/631190 |
| 264 #if defined(OS_WIN) |
| 265 #define MAYBE_WebAppBannerCreatedIndirectSingle DISABLED_WebAppBannerCreatedIndi
rectSingle |
| 266 #else |
| 267 #define MAYBE_WebAppBannerCreatedIndirectSingle WebAppBannerCreatedIndirectSingl
e |
| 268 #endif |
| 215 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 269 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 216 WebAppBannerCreatedIndirectSingle) { | 270 MAYBE_WebAppBannerCreatedIndirectSingle) { |
| 217 AppBannerSettingsHelper::SetEngagementWeights(1, 3); | 271 AppBannerSettingsHelper::SetEngagementWeights(1, 3); |
| 218 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_RELOAD, | 272 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_RELOAD, |
| 219 0, true); | 273 0, true); |
| 220 } | 274 } |
| 221 | 275 |
| 276 // http://crbug.com/631190 |
| 277 #if defined(OS_WIN) |
| 278 #define MAYBE_WebAppBannerCreatedIndirectMultiple DISABLED_WebAppBannerCreatedIn
directMultiple |
| 279 #else |
| 280 #define MAYBE_WebAppBannerCreatedIndirectMultiple WebAppBannerCreatedIndirectMul
tiple |
| 281 #endif |
| 222 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 282 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 223 WebAppBannerCreatedIndirectMultiple) { | 283 MAYBE_WebAppBannerCreatedIndirectMultiple) { |
| 224 AppBannerSettingsHelper::SetEngagementWeights(1, 0.5); | 284 AppBannerSettingsHelper::SetEngagementWeights(1, 0.5); |
| 225 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, | 285 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, |
| 226 3, true); | 286 3, true); |
| 227 } | 287 } |
| 228 | 288 |
| 289 // http://crbug.com/631190 |
| 290 #if defined(OS_WIN) |
| 291 #define MAYBE_WebAppBannerCreatedIndirectMultipleLargerTotal DISABLED_WebAppBann
erCreatedIndirectMultipleLargerTotal |
| 292 #else |
| 293 #define MAYBE_WebAppBannerCreatedIndirectMultipleLargerTotal WebAppBannerCreated
IndirectMultipleLargerTotal |
| 294 #endif |
| 229 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 295 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 230 WebAppBannerCreatedIndirectMultipleLargerTotal) { | 296 MAYBE_WebAppBannerCreatedIndirectMultipleLargerTotal) { |
| 231 AppBannerSettingsHelper::SetEngagementWeights(1, 0.5); | 297 AppBannerSettingsHelper::SetEngagementWeights(1, 0.5); |
| 232 AppBannerSettingsHelper::SetTotalEngagementToTrigger(4); | 298 AppBannerSettingsHelper::SetTotalEngagementToTrigger(4); |
| 233 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, | 299 RunBannerTest("/banners/manifest_test_page.html", ui::PAGE_TRANSITION_LINK, |
| 234 7, true); | 300 7, true); |
| 235 } | 301 } |
| 236 | 302 |
| 303 // http://crbug.com/631190 |
| 304 #if defined(OS_WIN) |
| 305 #define MAYBE_WebAppBannerCreatedVarious DISABLED_WebAppBannerCreatedVarious |
| 306 #else |
| 307 #define MAYBE_WebAppBannerCreatedVarious WebAppBannerCreatedVarious |
| 308 #endif |
| 237 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 309 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 238 WebAppBannerCreatedVarious) { | 310 MAYBE_WebAppBannerCreatedVarious) { |
| 239 AppBannerSettingsHelper::SetEngagementWeights(0.5, 0.25); | 311 AppBannerSettingsHelper::SetEngagementWeights(0.5, 0.25); |
| 240 | 312 |
| 241 std::string valid_page("/banners/manifest_test_page.html"); | 313 std::string valid_page("/banners/manifest_test_page.html"); |
| 242 GURL test_url = embedded_test_server()->GetURL(valid_page); | 314 GURL test_url = embedded_test_server()->GetURL(valid_page); |
| 243 content::WebContents* web_contents = | 315 content::WebContents* web_contents = |
| 244 browser()->tab_strip_model()->GetActiveWebContents(); | 316 browser()->tab_strip_model()->GetActiveWebContents(); |
| 245 | 317 |
| 246 // Add a direct nav on day 1. | 318 // Add a direct nav on day 1. |
| 247 ui_test_utils::NavigateToURL(browser(), test_url); | 319 ui_test_utils::NavigateToURL(browser(), test_url); |
| 248 RunFetcher(web_contents->GetURL(), std::string(), ui::PAGE_TRANSITION_TYPED, | 320 RunFetcher(web_contents->GetURL(), std::string(), ui::PAGE_TRANSITION_TYPED, |
| (...skipping 26 matching lines...) Expand all Loading... |
| 275 ui_test_utils::NavigateToURL(browser(), test_url); | 347 ui_test_utils::NavigateToURL(browser(), test_url); |
| 276 RunFetcher(web_contents->GetURL(), std::string(), | 348 RunFetcher(web_contents->GetURL(), std::string(), |
| 277 ui::PAGE_TRANSITION_FORM_SUBMIT, false); | 349 ui::PAGE_TRANSITION_FORM_SUBMIT, false); |
| 278 | 350 |
| 279 // Add a direct nav on day 4 which should trigger the banner. | 351 // Add a direct nav on day 4 which should trigger the banner. |
| 280 ui_test_utils::NavigateToURL(browser(), test_url); | 352 ui_test_utils::NavigateToURL(browser(), test_url); |
| 281 RunFetcher(web_contents->GetURL(), std::string(), | 353 RunFetcher(web_contents->GetURL(), std::string(), |
| 282 ui::PAGE_TRANSITION_TYPED, true); | 354 ui::PAGE_TRANSITION_TYPED, true); |
| 283 } | 355 } |
| 284 | 356 |
| 357 // http://crbug.com/631190 |
| 358 #if defined(OS_WIN) |
| 359 #define MAYBE_WebAppBannerNoTypeInManifest DISABLED_WebAppBannerNoTypeInManifest |
| 360 #else |
| 361 #define MAYBE_WebAppBannerNoTypeInManifest WebAppBannerNoTypeInManifest |
| 362 #endif |
| 285 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 363 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 286 WebAppBannerNoTypeInManifest) { | 364 MAYBE_WebAppBannerNoTypeInManifest) { |
| 287 RunBannerTest("/banners/manifest_no_type_test_page.html", | 365 RunBannerTest("/banners/manifest_no_type_test_page.html", |
| 288 ui::PAGE_TRANSITION_TYPED, 1, true); | 366 ui::PAGE_TRANSITION_TYPED, 1, true); |
| 289 } | 367 } |
| 290 | 368 |
| 369 // http://crbug.com/631190 |
| 370 #if defined(OS_WIN) |
| 371 #define MAYBE_WebAppBannerNoTypeInManifestCapsExtension DISABLED_WebAppBannerNoT
ypeInManifestCapsExtension |
| 372 #else |
| 373 #define MAYBE_WebAppBannerNoTypeInManifestCapsExtension WebAppBannerNoTypeInMani
festCapsExtension |
| 374 #endif |
| 291 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, | 375 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 292 WebAppBannerNoTypeInManifestCapsExtension) { | 376 MAYBE_WebAppBannerNoTypeInManifestCapsExtension) { |
| 293 RunBannerTest("/banners/manifest_no_type_caps_test_page.html", | 377 RunBannerTest("/banners/manifest_no_type_caps_test_page.html", |
| 294 ui::PAGE_TRANSITION_TYPED, 1, true); | 378 ui::PAGE_TRANSITION_TYPED, 1, true); |
| 295 } | 379 } |
| 296 | 380 |
| 297 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, PlayAppManifest) { | 381 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, PlayAppManifest) { |
| 298 std::string valid_page("/banners/play_app_test_page.html"); | 382 std::string valid_page("/banners/play_app_test_page.html"); |
| 299 GURL test_url = embedded_test_server()->GetURL(valid_page); | 383 GURL test_url = embedded_test_server()->GetURL(valid_page); |
| 300 content::WebContents* web_contents = | 384 content::WebContents* web_contents = |
| 301 browser()->tab_strip_model()->GetActiveWebContents(); | 385 browser()->tab_strip_model()->GetActiveWebContents(); |
| 302 | 386 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 313 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, NoManifest) { | 397 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, NoManifest) { |
| 314 RunBannerTest("/banners/no_manifest_test_page.html", | 398 RunBannerTest("/banners/no_manifest_test_page.html", |
| 315 ui::PAGE_TRANSITION_TYPED, 1, false); | 399 ui::PAGE_TRANSITION_TYPED, 1, false); |
| 316 } | 400 } |
| 317 | 401 |
| 318 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, MissingManifest) { | 402 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, MissingManifest) { |
| 319 RunBannerTest("/banners/manifest_bad_link.html", | 403 RunBannerTest("/banners/manifest_bad_link.html", |
| 320 ui::PAGE_TRANSITION_TYPED, 1, false); | 404 ui::PAGE_TRANSITION_TYPED, 1, false); |
| 321 } | 405 } |
| 322 | 406 |
| 323 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, CancelBannerDirect) { | 407 // http://crbug.com/631190 |
| 408 #if defined(OS_WIN) |
| 409 #define MAYBE_CancelBannerDirect DISABLED_CancelBannerDirect |
| 410 #else |
| 411 #define MAYBE_CancelBannerDirect CancelBannerDirect |
| 412 #endif |
| 413 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 414 MAYBE_CancelBannerDirect) { |
| 324 RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, | 415 RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, |
| 325 false); | 416 false); |
| 326 } | 417 } |
| 327 | 418 |
| 328 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, CancelBannerIndirect) { | 419 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, CancelBannerIndirect) { |
| 329 AppBannerSettingsHelper::SetEngagementWeights(1, 0.5); | 420 AppBannerSettingsHelper::SetEngagementWeights(1, 0.5); |
| 330 RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 3, | 421 RunBannerTest("/banners/cancel_test_page.html", ui::PAGE_TRANSITION_TYPED, 3, |
| 331 false); | 422 false); |
| 332 } | 423 } |
| 333 | 424 |
| 334 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, PromptBanner) { | 425 // http://crbug.com/631190 |
| 426 #if defined(OS_WIN) |
| 427 #define MAYBE_PromptBanner DISABLED_PromptBanner |
| 428 #else |
| 429 #define MAYBE_PromptBanner PromptBanner |
| 430 #endif |
| 431 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 432 MAYBE_PromptBanner) { |
| 335 RunBannerTest("/banners/prompt_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, | 433 RunBannerTest("/banners/prompt_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, |
| 336 true); | 434 true); |
| 337 } | 435 } |
| 338 | 436 |
| 339 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, PromptBannerInHandler) { | 437 // http://crbug.com/631190 |
| 438 #if defined(OS_WIN) |
| 439 #define MAYBE_PromptBannerInHandler DISABLED_PromptBannerInHandler |
| 440 #else |
| 441 #define MAYBE_PromptBannerInHandler PromptBannerInHandler |
| 442 #endif |
| 443 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, |
| 444 MAYBE_PromptBannerInHandler) { |
| 340 RunBannerTest("/banners/prompt_in_handler_test_page.html", | 445 RunBannerTest("/banners/prompt_in_handler_test_page.html", |
| 341 ui::PAGE_TRANSITION_TYPED, 1, true); | 446 ui::PAGE_TRANSITION_TYPED, 1, true); |
| 342 } | 447 } |
| 343 | 448 |
| 344 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, WebAppBannerInIFrame) { | 449 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, WebAppBannerInIFrame) { |
| 345 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, | 450 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, |
| 346 false); | 451 false); |
| 347 } | 452 } |
| 348 | 453 |
| 349 } // namespace banners | 454 } // namespace banners |
| OLD | NEW |