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

Unified Diff: content/renderer/resource_fetcher_browsertest.cc

Issue 328713006: Merge 275988 "Move about://-related constants from //content to ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2042/src/
Patch Set: Created 6 years, 6 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 | « content/renderer/render_frame_impl.cc ('k') | content/shell/browser/shell_application_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/resource_fetcher_browsertest.cc
===================================================================
--- content/renderer/resource_fetcher_browsertest.cc (revision 276109)
+++ content/renderer/resource_fetcher_browsertest.cc (working copy)
@@ -288,7 +288,7 @@
// If this flakes, use http://crbug.com/51622.
IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherDownload) {
// Need to spin up the renderer.
- NavigateToURL(shell(), GURL(kAboutBlankURL));
+ NavigateToURL(shell(), GURL(url::kAboutBlankURL));
ASSERT_TRUE(test_server()->Start());
GURL url(test_server()->GetURL("files/simple_page.html"));
@@ -300,7 +300,7 @@
IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcher404) {
// Need to spin up the renderer.
- NavigateToURL(shell(), GURL(kAboutBlankURL));
+ NavigateToURL(shell(), GURL(url::kAboutBlankURL));
// Test 404 response.
ASSERT_TRUE(test_server()->Start());
@@ -314,7 +314,7 @@
// If this flakes, use http://crbug.com/51622.
IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDidFail) {
// Need to spin up the renderer.
- NavigateToURL(shell(), GURL(kAboutBlankURL));
+ NavigateToURL(shell(), GURL(url::kAboutBlankURL));
PostTaskToInProcessRendererAndWait(
base::Bind(&ResourceFetcherTests::ResourceFetcherDidFailOnRenderer,
@@ -323,7 +323,7 @@
IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherTimeout) {
// Need to spin up the renderer.
- NavigateToURL(shell(), GURL(kAboutBlankURL));
+ NavigateToURL(shell(), GURL(url::kAboutBlankURL));
// Grab a page that takes at least 1 sec to respond, but set the fetcher to
// timeout in 0 sec.
@@ -338,7 +338,7 @@
IN_PROC_BROWSER_TEST_F(ResourceFetcherTests,
MAYBE_ResourceFetcherDeletedInCallback) {
// Need to spin up the renderer.
- NavigateToURL(shell(), GURL(kAboutBlankURL));
+ NavigateToURL(shell(), GURL(url::kAboutBlankURL));
// Grab a page that takes at least 1 sec to respond, but set the fetcher to
// timeout in 0 sec.
@@ -356,7 +356,7 @@
// Test that ResourceFetchers can handle POSTs.
IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherPost) {
// Need to spin up the renderer.
- NavigateToURL(shell(), GURL(kAboutBlankURL));
+ NavigateToURL(shell(), GURL(url::kAboutBlankURL));
// Grab a page that echos the POST body.
ASSERT_TRUE(test_server()->Start());
@@ -371,7 +371,7 @@
// Test that ResourceFetchers can set headers.
IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherSetHeader) {
// Need to spin up the renderer.
- NavigateToURL(shell(), GURL(kAboutBlankURL));
+ NavigateToURL(shell(), GURL(url::kAboutBlankURL));
// Grab a page that echos the POST body.
ASSERT_TRUE(test_server()->Start());
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/shell/browser/shell_application_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698