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

Unified Diff: content/browser/manifest/manifest_browsertest.cc

Issue 901093003: Fix ManifestBrowserTest.Navigation to not time out --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/manifest/manifest_browsertest.cc
diff --git a/content/browser/manifest/manifest_browsertest.cc b/content/browser/manifest/manifest_browsertest.cc
index b31d26ac4b59952cfb6a35cd39a49749dff54595..75b08dca1b6fb3360fc0aa0bf6fafbbfe4cd7dc0 100644
--- a/content/browser/manifest/manifest_browsertest.cc
+++ b/content/browser/manifest/manifest_browsertest.cc
@@ -284,8 +284,10 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, ParsingErrorsManifest) {
// If a page has a manifest and the page is navigated to a page without a
// manifest, the page's manifest should be updated.
IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, Navigation) {
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
{
- GURL test_url = GetTestUrl("manifest", "dummy-manifest.html");
+ GURL test_url =
+ embedded_test_server()->GetURL("/manifest/dummy-manifest.html");
TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
shell()->LoadURL(test_url);
@@ -297,7 +299,8 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, Navigation) {
}
{
- GURL test_url = GetTestUrl("manifest", "no-manifest.html");
+ GURL test_url =
+ embedded_test_server()->GetURL("/manifest/no-manifest.html");
TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
shell()->LoadURL(test_url);
« 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