retry r71405:

Make new chrome UI security model the default.

allows us to update URL in chrome://settings when the user navigates within it.

BUG=57485
TEST=manual

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

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

5 files changed, 3 insertions, 12 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index b17ba19..437e61f 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -708,7 +708,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kLoggingLevel,
     switches::kMemoryProfiling,
     switches::kMessageLoopHistogrammer,
-    switches::kNewChromeUISecurityModel,
     switches::kNoJsRandomness,
     switches::kNoReferrers,
     switches::kNoSandbox,
diff --git a/chrome/browser/resources/options/options_page.js b/chrome/browser/resources/options/options_page.js
index 429ee08..e0f5296 100644
--- a/chrome/browser/resources/options/options_page.js
+++ b/chrome/browser/resources/options/options_page.js
@@ -551,7 +551,8 @@ cr.define('options', function() {
           OptionsPage.updateManagedBannerVisibility();
 
           // Recent webkit change no longer allows url change from "chrome://".
-          window.history.pushState({pageName: this.name}, this.title);
+          window.history.pushState({pageName: this.name}, this.title,
+                                   '/' + this.name);
         }
         if (this.tab) {
           this.tab.classList.add('navbar-item-selected');
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 282c5d1..3733b4b 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -840,9 +840,6 @@ const char kNaClLoaderProcess[]             = "nacl-loader";
 // Causes the Native Client process to display a dialog on launch.
 const char kNaClStartupDialog[]             = "nacl-startup-dialog";
 
-// Enables the new security model for "chrome" URLs.
-const char kNewChromeUISecurityModel[]      = "new-chrome-ui-security-model";
-
 // Disables the default browser check. Useful for UI/browser tests where we
 // want to avoid having the default browser info-bar displayed.
 const char kNoDefaultBrowserCheck[]         = "no-default-browser-check";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 48a3c2d..fc91edf 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -241,7 +241,6 @@ extern const char kNaClDebugPorts[];
 extern const char kNaClBrokerProcess[];
 extern const char kNaClLoaderProcess[];
 extern const char kNaClStartupDialog[];
-extern const char kNewChromeUISecurityModel[];
 extern const char kNoDefaultBrowserCheck[];
 extern const char kNoEvents[];
 extern const char kNoExperiments[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index bb2e240..fc9243f 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -890,12 +890,7 @@ void RenderThread::EnsureWebKitInitialized() {
   // also be unable to script anything but themselves (to help limit the damage
   // that a corrupt chrome: page could cause).
   WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme));
-  if (command_line.HasSwitch(switches::kNewChromeUISecurityModel)) {
-    WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme);
-  } else {
-    WebSecurityPolicy::registerURLSchemeAsLocal(chrome_ui_scheme);
-    WebSecurityPolicy::registerURLSchemeAsNoAccess(chrome_ui_scheme);
-  }
+  WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme);
 
   // chrome-extension: resources shouldn't trigger insecure content warnings.
   WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme));