diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 11:46:17 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 11:46:17 +0000 |
| commit | 8e09c7af875d86eb8174c5fb5a12ddec9ac8c38e (patch) | |
| tree | 0a680f2c9e86cd0c3152bbec6d9598a29e3b527d /content/browser/renderer_host | |
| parent | 073a4adbec38b7cc7d175e4b4b26d94832e0bcb1 (diff) | |
| download | chromium_src-8e09c7af875d86eb8174c5fb5a12ddec9ac8c38e.zip chromium_src-8e09c7af875d86eb8174c5fb5a12ddec9ac8c38e.tar.gz chromium_src-8e09c7af875d86eb8174c5fb5a12ddec9ac8c38e.tar.bz2 | |
Move about://-related constants from //content to //url
kAboutScheme and kAboutBlankURL are used in code shared by iOS, and are general
enough to live in //url instead of //content.
TBR=yoz,benm
Review URL: https://codereview.chromium.org/325443002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 8 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_view_host_unittest.cc | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 81d8cc9..66cbbcf 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1654,15 +1654,15 @@ void RenderProcessHostImpl::FilterURL(RenderProcessHost* rph, // This is because the browser treats navigation to an empty GURL as a // navigation to the home page. This is often a privileged page // (chrome://newtab/) which is exactly what we don't want. - *url = GURL(kAboutBlankURL); + *url = GURL(url::kAboutBlankURL); RecordAction(base::UserMetricsAction("FilterURLTermiate_Invalid")); return; } - if (url->SchemeIs(kAboutScheme)) { + if (url->SchemeIs(url::kAboutScheme)) { // The renderer treats all URLs in the about: scheme as being about:blank. // Canonicalize about: URLs to about:blank. - *url = GURL(kAboutBlankURL); + *url = GURL(url::kAboutBlankURL); RecordAction(base::UserMetricsAction("FilterURLTermiate_About")); } @@ -1676,7 +1676,7 @@ void RenderProcessHostImpl::FilterURL(RenderProcessHost* rph, // URL. This prevents us from storing the blocked URL and becoming confused // later. VLOG(1) << "Blocked URL " << url->spec(); - *url = GURL(kAboutBlankURL); + *url = GURL(url::kAboutBlankURL); RecordAction(base::UserMetricsAction("FilterURLTermiate_Blocked")); } } diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 15fa110..6889cd6f 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -63,7 +63,8 @@ class RenderViewHostTest : public RenderViewHostImplTestHarness { TEST_F(RenderViewHostTest, FilterAbout) { test_rvh()->SendNavigate(1, GURL("about:cache")); ASSERT_TRUE(controller().GetVisibleEntry()); - EXPECT_EQ(GURL(kAboutBlankURL), controller().GetVisibleEntry()->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), + controller().GetVisibleEntry()->GetURL()); } // Create a full screen popup RenderWidgetHost and View. @@ -152,8 +153,8 @@ TEST_F(RenderViewHostTest, StartDragging) { drop_data.url = file_url; drop_data.html_base_url = file_url; test_rvh()->TestOnStartDragging(drop_data); - EXPECT_EQ(GURL(kAboutBlankURL), delegate_view.drag_url()); - EXPECT_EQ(GURL(kAboutBlankURL), delegate_view.html_base_url()); + EXPECT_EQ(GURL(url::kAboutBlankURL), delegate_view.drag_url()); + EXPECT_EQ(GURL(url::kAboutBlankURL), delegate_view.html_base_url()); GURL http_url = GURL("http://www.domain.com/index.html"); drop_data.url = http_url; |