Change chrome-ui to chrome. I didn't go too far in converting existing strings to using the url_constant (shipshipship).

Users (such as those on Beta and Dev using session restore) attempting to load the old pages will see a blank white screen.

BUG=11272
TEST=Verify that the inspector, debugger, history, downloads and newtab pages load with chrome:// URLS. Verify that replacing the chrome:// with chrome-ui:// does not work.


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

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

4 files changed, 8 insertions, 6 deletions

diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 7bf055e..11b3cb0 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -317,9 +317,9 @@ void RenderThread::EnsureWebKitInitialized() {
   webkit_client_.reset(new RendererWebKitClientImpl);
   WebKit::initialize(webkit_client_.get());
 
-  // chrome-ui pages should not be accessible by normal content, and should
+  // chrome: pages should not be accessible by normal content, and should
   // also be unable to script anything but themselves (to help limit the damage
-  // that a corrupt chrome-ui page could cause).
+  // that a corrupt chrome: page could cause).
   WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme));
   WebKit::registerURLSchemeAsLocal(chrome_ui_scheme);
   WebKit::registerURLSchemeAsNoAccess(chrome_ui_scheme);
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 3e62e11..d173537 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -137,7 +137,7 @@ static int32 next_page_id_ = 1;
 static const int kMaximumNumberOfUnacknowledgedPopups = 25;
 
 static const char* const kUnreachableWebDataURL =
-    "chrome-ui://chromewebdata/";
+    "chrome://chromewebdata/";
 
 static const char* const kBackForwardNavigationScheme = "history";
 
diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc
index d9a1ced..8403746 100644
--- a/chrome/renderer/render_view_unittest.cc
+++ b/chrome/renderer/render_view_unittest.cc
@@ -23,7 +23,7 @@ TEST_F(RenderViewTest, OnLoadAlternateHTMLText) {
   EXPECT_EQ(ViewHostMsg_DidStartProvisionalLoadForFrame::ID, msg->type());
   ViewHostMsg_DidStartProvisionalLoadForFrame::Param start_params;
   ViewHostMsg_DidStartProvisionalLoadForFrame::Read(msg, &start_params);
-  EXPECT_EQ(GURL("chrome-ui://chromewebdata/"), start_params.b);
+  EXPECT_EQ(GURL("chrome://chromewebdata/"), start_params.b);
 }
 
 // Test that we get form state change notifications when input fields change.
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 75c4063..ea8129e 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -19,6 +19,7 @@
 #include "base/string_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/net/render_dns_master.h"
 #include "chrome/renderer/render_process.h"
@@ -207,11 +208,12 @@ void ClipboardReadHTML(string16* markup, GURL* url) {
 }
 
 GURL GetInspectorURL() {
-  return GURL("chrome-ui://inspector/inspector.html");
+  return GURL(std::string(chrome::kChromeUIScheme) +
+              "//inspector/inspector.html");
 }
 
 std::string GetUIResourceProtocol() {
-  return "chrome-ui";
+  return "chrome";
 }
 
 bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {