retry r71405:

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

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=72701

[Evan Stade, 2011-01-26 19:39:49]

try jobs:
http://build.chromium.org/p/tryserver.chromium/builders/win/builds/12473
http://build.chromium.org/p/tryserver.chromium/builders/mac/builds/10308
http://build.chromium.org/p/tryserver.chromium/builders/linux/builds/9867

[abarth-chromium, 2011-01-26 19:43:02]

LGTM

On Wed, Jan 26, 2011 at 11:39 AM,  <estade@chromium.org> wrote:
> Reviewers: abarth,
>
> Message:
> try jobs:
> http://build.chromium.org/p/tryserver.chromium/builders/win/builds/12473
> http://build.chromium.org/p/tryserver.chromium/builders/mac/builds/10308
> http://build.chromium.org/p/tryserver.chromium/builders/linux/builds/9867
>
> Description:
> 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
>
> Please review this at http://codereview.chromium.org/6240010/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M chrome/browser/renderer_host/browser_render_process_host.cc
>  M chrome/browser/resources/options/options_page.js
>  M chrome/common/chrome_switches.h
>  M chrome/common/chrome_switches.cc
>  M chrome/renderer/render_thread.cc
>
>
> Index: chrome/browser/renderer_host/browser_render_process_host.cc
> diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc
> b/chrome/browser/renderer_host/browser_render_process_host.cc
> index
>
3ebcacf0583214d24a588a7cfb911cb3d5228057..e651ccc48ff7e507ed88b85ddeb42a63e3e33eb4
> 100644
> --- a/chrome/browser/renderer_host/browser_render_process_host.cc
> +++ b/chrome/browser/renderer_host/browser_render_process_host.cc
> @@ -721,7 +721,6 @@ void
> BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
>     switches::kRemoteShellPort,
>     switches::kEnablePepperTesting,
>     switches::kAllowOutdatedPlugins,
> -    switches::kNewChromeUISecurityModel,
>     switches::kEnableRemoting,
>     switches::kEnableClickToPlay,
>     switches::kEnableResourceContentSettings,
> Index: chrome/browser/resources/options/options_page.js
> diff --git a/chrome/browser/resources/options/options_page.js
> b/chrome/browser/resources/options/options_page.js
> index
>
510e1e577bc35d32c51495f0ef533e1d7303abfb..2c22e4d36a089bf686859dea19b37aed58c28176
> 100644
> --- a/chrome/browser/resources/options/options_page.js
> +++ b/chrome/browser/resources/options/options_page.js
> @@ -499,7 +499,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');
> Index: chrome/common/chrome_switches.cc
> diff --git a/chrome/common/chrome_switches.cc
> b/chrome/common/chrome_switches.cc
> index
>
64524ee2c764dcc16da66cf39b1158a6d044d42c..abb57d01d76c25f16a7c9e7ce7eb1f1dab5527a7
> 100644
> --- a/chrome/common/chrome_switches.cc
> +++ b/chrome/common/chrome_switches.cc
> @@ -850,9 +850,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";
> Index: chrome/common/chrome_switches.h
> diff --git a/chrome/common/chrome_switches.h
> b/chrome/common/chrome_switches.h
> index
>
1d718d5a940ff169cc30e716567a77d196af5aca..9536841f4d7622d0c5e4ede2dfbf446befd2021f
> 100644
> --- a/chrome/common/chrome_switches.h
> +++ b/chrome/common/chrome_switches.h
> @@ -244,7 +244,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[];
> Index: chrome/renderer/render_thread.cc
> diff --git a/chrome/renderer/render_thread.cc
> b/chrome/renderer/render_thread.cc
> index
>
a80fc7bd707f18a8789eb3e84c7fa7c55299765e..fd55fe8cab83dad6a00d4585b6ac1167f9ebfb81
> 100644
> --- a/chrome/renderer/render_thread.cc
> +++ b/chrome/renderer/render_thread.cc
> @@ -864,12 +864,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));
>
>
>