More URL constants replacement.

Review URL: http://codereview.chromium.org/28170

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10487 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 17 insertions, 15 deletions

diff --git a/chrome/browser/renderer_host/render_view_host_unittest.cc b/chrome/browser/renderer_host/render_view_host_unittest.cc
index 0ae9e46..22ee2ab 100644
--- a/chrome/browser/renderer_host/render_view_host_unittest.cc
+++ b/chrome/browser/renderer_host/render_view_host_unittest.cc
@@ -4,6 +4,7 @@
 

 #include "chrome/browser/renderer_host/test_render_view_host.h"

 #include "chrome/browser/tab_contents/navigation_entry.h"

+#include "chrome/common/url_constants.h"

 

 namespace {

 

@@ -15,7 +16,7 @@ class RenderViewHostTest : public RenderViewHostTestHarness {
 // All about URLs reported by the renderer should get rewritten to about:blank.

 // See RenderViewHost::OnMsgNavigate for a discussion.

 TEST_F(RenderViewHostTest, FilterAbout) {

-  rvh()->SendNavigate(1, GURL("about:cache"));

+  rvh()->SendNavigate(1, GURL(chrome::kAboutCacheURL));

   ASSERT_TRUE(controller_->GetActiveEntry());

-  EXPECT_EQ(GURL("about:blank"), controller_->GetActiveEntry()->url());

+  EXPECT_EQ(GURL(chrome::kAboutBlankURL), controller_->GetActiveEntry()->url());

 }

diff --git a/chrome/browser/renderer_host/renderer_security_policy_unittest.cc b/chrome/browser/renderer_host/renderer_security_policy_unittest.cc
index c9faaea..d237b7e 100644
--- a/chrome/browser/renderer_host/renderer_security_policy_unittest.cc
+++ b/chrome/browser/renderer_host/renderer_security_policy_unittest.cc
@@ -87,26 +87,26 @@ TEST_F(RendererSecurityPolicyTest, AboutTest) {
   EXPECT_TRUE(p->CanRequestURL(kRendererID, GURL("aBouT:BlAnK")));
   EXPECT_TRUE(p->CanRequestURL(kRendererID, GURL("aBouT:blank")));
 
-  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("about:memory")));
-  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("about:crash")));
-  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("about:cache")));
-  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("about:hang")));
+  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL(chrome::kAboutMemoryURL)));
+  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL(chrome::kAboutCrashURL)));
+  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL(chrome::kAboutCacheURL)));
+  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL(chrome::kAboutHangURL)));
 
   EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("aBoUt:memory")));
   EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("about:CrASh")));
   EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("abOuT:cAChe")));
 
-  p->GrantRequestURL(kRendererID, GURL("about:memory"));
-  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("about:memory")));
+  p->GrantRequestURL(kRendererID, GURL(chrome::kAboutMemoryURL));
+  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL(chrome::kAboutMemoryURL)));
 
-  p->GrantRequestURL(kRendererID, GURL("about:crash"));
-  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("about:crash")));
+  p->GrantRequestURL(kRendererID, GURL(chrome::kAboutCrashURL));
+  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL(chrome::kAboutCrashURL)));
 
-  p->GrantRequestURL(kRendererID, GURL("about:cache"));
-  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("about:cache")));
+  p->GrantRequestURL(kRendererID, GURL(chrome::kAboutCacheURL));
+  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL(chrome::kAboutCacheURL)));
 
-  p->GrantRequestURL(kRendererID, GURL("about:hang"));
-  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("about:hang")));
+  p->GrantRequestURL(kRendererID, GURL(chrome::kAboutHangURL));
+  EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL(chrome::kAboutHangURL)));
 
   p->Remove(kRendererID);
 }
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
index 5d3a6b8..61fa1b4 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/automation/url_request_failed_dns_job.h"
 #include "chrome/browser/automation/url_request_mock_http_job.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
@@ -189,7 +190,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteAfterCrash) {
 
   // Cause the renderer to crash.
   expected_crashes_ = 1;
-  tab->NavigateToURLAsync(GURL("about:crash"));
+  tab->NavigateToURLAsync(GURL(chrome::kAboutCrashURL));
   Sleep(sleep_timeout_ms());  // Wait for browser to notice the renderer crash.
 
   // Navigate to a new cross-site page.  The browser should not wait around for