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

Side by Side Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 692333009: Fixed the problem at the source of the flaky WebViewTest.ShimArcAttribute test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another small fix. Created 6 years, 1 month 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 | extensions/renderer/resources/guest_view/web_view_attributes.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/path_service.h" 5 #include "base/path_service.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/apps/app_browsertest_util.h" 8 #include "chrome/browser/apps/app_browsertest_util.h"
9 #include "chrome/browser/chrome_content_browser_client.h" 9 #include "chrome/browser/chrome_content_browser_client.h"
10 #include "chrome/browser/prerender/prerender_link_manager.h" 10 #include "chrome/browser/prerender/prerender_link_manager.h"
(...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1247 content::WebContents* guest_web_contents = 1247 content::WebContents* guest_web_contents =
1248 GetGuestViewManager()->WaitForSingleGuestCreated(); 1248 GetGuestViewManager()->WaitForSingleGuestCreated();
1249 ASSERT_TRUE(guest_web_contents->GetRenderProcessHost()->IsIsolatedGuest()); 1249 ASSERT_TRUE(guest_web_contents->GetRenderProcessHost()->IsIsolatedGuest());
1250 content::WaitForInterstitialAttach(guest_web_contents); 1250 content::WaitForInterstitialAttach(guest_web_contents);
1251 1251
1252 // Now close the app while interstitial page being shown in guest. 1252 // Now close the app while interstitial page being shown in guest.
1253 extensions::AppWindow* window = GetFirstAppWindow(); 1253 extensions::AppWindow* window = GetFirstAppWindow();
1254 window->GetBaseWindow()->Close(); 1254 window->GetBaseWindow()->Close();
1255 } 1255 }
1256 1256
1257 #if defined(OS_LINUX) 1257 IN_PROC_BROWSER_TEST_F(WebViewTest, ShimSrcAttribute) {
1258 // http://crbug.com/431604
1259 #define MAYBE_ShimSrcAttribute DISABLED_ShimSrcAttribute
1260 #else
1261 #define MAYBE_ShimSrcAttribute ShimSrcAttribute
1262 #endif
1263 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_ShimSrcAttribute) {
1264 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/src_attribute")) 1258 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/src_attribute"))
1265 << message_; 1259 << message_;
1266 } 1260 }
1267 1261
1268 // This test verifies that prerendering has been disabled inside <webview>. 1262 // This test verifies that prerendering has been disabled inside <webview>.
1269 // This test is here rather than in PrerenderBrowserTest for testing convenience 1263 // This test is here rather than in PrerenderBrowserTest for testing convenience
1270 // only. If it breaks then this is a bug in the prerenderer. 1264 // only. If it breaks then this is a bug in the prerenderer.
1271 IN_PROC_BROWSER_TEST_F(WebViewTest, NoPrerenderer) { 1265 IN_PROC_BROWSER_TEST_F(WebViewTest, NoPrerenderer) {
1272 ASSERT_TRUE(StartEmbeddedTestServer()); 1266 ASSERT_TRUE(StartEmbeddedTestServer());
1273 content::WebContents* guest_web_contents = 1267 content::WebContents* guest_web_contents =
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
2307 // http://crbug.com/403325 2301 // http://crbug.com/403325
2308 #define MAYBE_WebViewInBackgroundPage \ 2302 #define MAYBE_WebViewInBackgroundPage \
2309 DISABLED_WebViewInBackgroundPage 2303 DISABLED_WebViewInBackgroundPage
2310 #else 2304 #else
2311 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage 2305 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage
2312 #endif 2306 #endif
2313 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { 2307 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) {
2314 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) 2308 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background"))
2315 << message_; 2309 << message_;
2316 } 2310 }
OLDNEW
« no previous file with comments | « no previous file | extensions/renderer/resources/guest_view/web_view_attributes.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698