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

content/public/common/url_constants.cc

Index: content/public/common/url_constants.cc
===================================================================
--- content/public/common/url_constants.cc	(revision 126242)
+++ content/public/common/url_constants.cc	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -46,7 +46,9 @@
 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);