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

Unified Diff: content/browser/web_contents/web_contents_impl_unittest.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
Index: content/browser/web_contents/web_contents_impl_unittest.cc
===================================================================
--- content/browser/web_contents/web_contents_impl_unittest.cc (revision 276109)
+++ content/browser/web_contents/web_contents_impl_unittest.cc (working copy)
@@ -325,7 +325,8 @@
NavigationControllerImpl& cont =
static_cast<NavigationControllerImpl&>(controller());
FrameHostMsg_DidCommitProvisionalLoad_Params params;
- InitNavigateParams(&params, 0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED);
+ InitNavigateParams(
+ &params, 0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
LoadCommittedDetails details;
cont.RendererDidNavigate(main_test_rfh(), params, &details);
@@ -1232,7 +1233,7 @@
// When opening a new window, it is navigated to about:blank internally.
// Currently, this results in two DidNavigate events.
- const GURL url(kAboutBlankURL);
+ const GURL url(url::kAboutBlankURL);
contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);
contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);
@@ -2297,7 +2298,7 @@
// A navigation to about:whatever should always look like a navigation to
// about:blank
- GURL url_normalized(kAboutBlankURL);
+ GURL url_normalized(url::kAboutBlankURL);
GURL url_from_ipc("about:whatever");
// We navigate the test WebContents to about:blank, since NavigateAndCommit
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/browser/webui/web_ui_controller_factory_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698