Commit 69651b36 authored by Makoto Shimazu's avatar Makoto Shimazu Committed by Commit Bot

Disable several WebViewTests correctly

This is following-on to crrev.com/c/746601 and crrev.com/c/747627. The original
patch to disable the tests is missing to add MAYBE_ prefixes for each test.

TBR=lazyboy@chromium.org

Bug: 779973
Change-Id: Ib6a86f61972436034c84694ce87ebab763db7f89
Reviewed-on: https://chromium-review.googlesource.com/748402Reviewed-by: default avatarMakoto Shimazu <shimazu@chromium.org>
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513084}
parent 4ca4ea2c
...@@ -1779,13 +1779,13 @@ IN_PROC_BROWSER_TEST_P(WebViewSizeTest, Shim_TestResizeWebviewResizesContent) { ...@@ -1779,13 +1779,13 @@ IN_PROC_BROWSER_TEST_P(WebViewSizeTest, Shim_TestResizeWebviewResizesContent) {
// Test makes sure that interstitial pages renders in <webview>. // Test makes sure that interstitial pages renders in <webview>.
// Flaky on Win dbg: crbug.com/779973 // Flaky on Win dbg: crbug.com/779973
#if defined(OS_WIN) && defined(NDEBUG) #if defined(OS_WIN) && !defined(NDEBUG)
#define MAYBE_InterstitialPage DISABLED_InterstitialPage #define MAYBE_InterstitialPage DISABLED_InterstitialPage
#else #else
#define MAYBE_InterstitialPage InterstitialPage #define MAYBE_InterstitialPage InterstitialPage
#endif #endif
IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPage) { IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_InterstitialPage) {
// This test tests that a inner WebContents' InterstitialPage is properly // This test tests that a inner WebContents' InterstitialPage is properly
// connected to an outer WebContents through a CrossProcessFrameConnector, it // connected to an outer WebContents through a CrossProcessFrameConnector, it
// doesn't make sense for BrowserPlugin based guests. // doesn't make sense for BrowserPlugin based guests.
...@@ -1809,13 +1809,13 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPage) { ...@@ -1809,13 +1809,13 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPage) {
// Test makes sure that interstitial pages are registered in the // Test makes sure that interstitial pages are registered in the
// RenderWidgetHostInputEventRouter when inside a <webview>. // RenderWidgetHostInputEventRouter when inside a <webview>.
// Flaky on Win dbg: crbug.com/779973 // Flaky on Win dbg: crbug.com/779973
#if defined(OS_WIN) && defined(NDEBUG) #if defined(OS_WIN) && !defined(NDEBUG)
#define MAYBE_InterstitialPageRouteEvents DISABLED_InterstitialPageRouteEvents #define MAYBE_InterstitialPageRouteEvents DISABLED_InterstitialPageRouteEvents
#else #else
#define MAYBE_InterstitialPageRouteEvents InterstitialPageRouteEvents #define MAYBE_InterstitialPageRouteEvents InterstitialPageRouteEvents
#endif #endif
IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPageRouteEvents) { IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_InterstitialPageRouteEvents) {
// This test tests that a inner WebContents' InterstitialPage is properly // This test tests that a inner WebContents' InterstitialPage is properly
// connected to an outer WebContents through a CrossProcessFrameConnector, it // connected to an outer WebContents through a CrossProcessFrameConnector, it
// doesn't make sense for BrowserPlugin based guests. // doesn't make sense for BrowserPlugin based guests.
...@@ -1846,7 +1846,7 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPageRouteEvents) { ...@@ -1846,7 +1846,7 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPageRouteEvents) {
#define MAYBE_InterstitialPageFocusedWidget InterstitialPageFocusedWidget #define MAYBE_InterstitialPageFocusedWidget InterstitialPageFocusedWidget
#endif #endif
IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPageFocusedWidget) { IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_InterstitialPageFocusedWidget) {
// This test tests that a inner WebContents' InterstitialPage is properly // This test tests that a inner WebContents' InterstitialPage is properly
// connected to an outer WebContents through a CrossProcessFrameConnector, it // connected to an outer WebContents through a CrossProcessFrameConnector, it
// doesn't make sense for BrowserPlugin based guests. // doesn't make sense for BrowserPlugin based guests.
...@@ -1906,7 +1906,7 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPageFocusedWidget) { ...@@ -1906,7 +1906,7 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPageFocusedWidget) {
#define MAYBE_InterstitialPageDetach InterstitialPageDetach #define MAYBE_InterstitialPageDetach InterstitialPageDetach
#endif #endif
IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPageDetach) { IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_InterstitialPageDetach) {
InterstitialTestHelper(); InterstitialTestHelper();
content::WebContents* guest_web_contents = content::WebContents* guest_web_contents =
...@@ -1930,7 +1930,7 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPageDetach) { ...@@ -1930,7 +1930,7 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialPageDetach) {
#define MAYBE_InterstitialTeardown InterstitialTeardown #define MAYBE_InterstitialTeardown InterstitialTeardown
#endif #endif
IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialTeardown) { IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_InterstitialTeardown) {
InterstitialTestHelper(); InterstitialTestHelper();
// Now close the app while interstitial page being shown in guest. // Now close the app while interstitial page being shown in guest.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment