Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: chrome/browser/banners/app_banner_data_fetcher_browsertest.cc

Issue 1273013003: Disable WebAppBannerInIFrame on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 #define MAYBE_PromptBannerInHandler DISABLED_PromptBannerInHandler 350 #define MAYBE_PromptBannerInHandler DISABLED_PromptBannerInHandler
351 #else 351 #else
352 #define MAYBE_PromptBannerInHandler PromptBannerInHandler 352 #define MAYBE_PromptBannerInHandler PromptBannerInHandler
353 #endif 353 #endif
354 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, 354 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
355 MAYBE_PromptBannerInHandler) { 355 MAYBE_PromptBannerInHandler) {
356 RunBannerTest("/banners/prompt_in_handler_test_page.html", 356 RunBannerTest("/banners/prompt_in_handler_test_page.html",
357 ui::PAGE_TRANSITION_TYPED, 1, true); 357 ui::PAGE_TRANSITION_TYPED, 1, true);
358 } 358 }
359 359
360 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest, WebAppBannerInIFrame) { 360 // http://crbug.com/517307
361 #if defined(OS_WIN)
362 #define MAYBE_WebAppBannerInIFrame DISABLED_WebAppBannerInIFrame
363 #else
364 #define MAYBE_WebAppBannerInIFrame WebAppBannerInIFrame
365 #endif
366
367 IN_PROC_BROWSER_TEST_F(AppBannerDataFetcherBrowserTest,
368 MAYBE_WebAppBannerInIFrame) {
361 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 1, 369 RunBannerTest("/banners/iframe_test_page.html", ui::PAGE_TRANSITION_TYPED, 1,
362 false); 370 false);
363 } 371 }
364 372
365 } // namespace banners 373 } // namespace banners
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698