Merge 125635 - Don't put the error URL in the chrome:// scheme.

content/public/common/url_constants.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/common/url_constants.h"
 
 #include "base/string_util.h"
 #include "googleurl/src/url_util.h"
 
 namespace {
 const char* kDefaultSavableSchemes[] = {
@@ skipping 27 matching lines @@
 const char kJavaScriptScheme[] = "javascript";
 const char kMailToScheme[] = "mailto";
 const char kMetadataScheme[] = "metadata";
 const char kViewSourceScheme[] = "view-source";
 
 const char kStandardSchemeSeparator[] = "://";
 
 const char kAboutBlankURL[] = "about:blank";
 const char kAboutCrashURL[] = "about:crash";
 
-const char kUnreachableWebDataURL[] = "chrome://chromewebdata/";
+// This error URL is loaded in normal web renderer processes, so it should not
+// have a chrome:// scheme that might let it be confused with a WebUI page.
+const char kUnreachableWebDataURL[] = "data:text/html,chromewebdata";
 
 const char** GetSavableSchemes() {
   return const_cast<const char**>(g_savable_schemes);
 }
 
 void RegisterContentSchemes(const char** additional_savable_schemes) {
   // Don't need "chrome-internal" which was used in old versions of Chrome for
   // the new tab page.
   url_util::AddStandardScheme(kChromeDevToolsScheme);
   url_util::AddStandardScheme(kChromeUIScheme);
@@ skipping 18 matching lines @@
            arraysize(kDefaultSavableSchemes) * sizeof(char*));
     for (int i = 0; i < schemes; ++i) {
       g_savable_schemes[arraysize(kDefaultSavableSchemes) + i - 1] =
           base::strdup(additional_savable_schemes[i]);
     }
     g_savable_schemes[arraysize(kDefaultSavableSchemes) + schemes - 1] = 0;
   }
 }
 
 }  // namespace chrome