From 218ebce4d1ea1554cfa9ad6f14c24ae699c6841d Mon Sep 17 00:00:00 2001 From: "msw@chromium.org" Date: Sat, 14 Dec 2013 00:33:02 +0000 Subject: Remove chrome-internal scheme, chrome::kChromeInternalScheme. The chrome-internal scheme was once used to host the NTP. It's now hosted at about:newtab, aka. chrome://newtab. There's no compelling reason to support chrome-internal. BUG=6564,327845 R=jam@chromium.org TEST=chrome-internal://foo no longer redirects to the new tab page, no one gets upset. Review URL: https://codereview.chromium.org/114883002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240819 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/chrome_content_renderer_client.cc | 10 +++------- chrome/renderer/content_settings_observer.cc | 3 --- chrome/renderer/content_settings_observer_unittest.cc | 6 ------ 3 files changed, 3 insertions(+), 16 deletions(-) (limited to 'chrome/renderer') diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 1ef8502..74272ed 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -289,10 +289,9 @@ void ChromeContentRendererClient::RenderThreadStarted() { if (command_line->HasSwitch(switches::kNewProfileManagement)) thread->RegisterExtension(extensions_v8::PrincipalsExtension::Get()); - // chrome:, chrome-search:, chrome-devtools:, and chrome-internal: 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 - // page could cause). + // chrome:, chrome-search:, and chrome-devtools: 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 page could cause). WebString chrome_ui_scheme(ASCIIToUTF16(chrome::kChromeUIScheme)); WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_ui_scheme); @@ -305,9 +304,6 @@ void ChromeContentRendererClient::RenderThreadStarted() { WebString dev_tools_scheme(ASCIIToUTF16(chrome::kChromeDevToolsScheme)); WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dev_tools_scheme); - WebString internal_scheme(ASCIIToUTF16(chrome::kChromeInternalScheme)); - WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(internal_scheme); - #if defined(OS_CHROMEOS) WebString drive_scheme(ASCIIToUTF16(chrome::kDriveScheme)); WebSecurityPolicy::registerURLSchemeAsLocal(drive_scheme); diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index c396153..ad1c017 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -682,9 +682,6 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings( if (EqualsASCII(origin.protocol(), extensions::kExtensionScheme)) return true; - if (EqualsASCII(origin.protocol(), chrome::kChromeInternalScheme)) - return true; - // TODO(creis, fsamuel): Remove this once the concept of swapped out // RenderViews goes away. if (document_url == GURL(content::kSwappedOutURL)) diff --git a/chrome/renderer/content_settings_observer_unittest.cc b/chrome/renderer/content_settings_observer_unittest.cc index 0588944..6e97117 100644 --- a/chrome/renderer/content_settings_observer_unittest.cc +++ b/chrome/renderer/content_settings_observer_unittest.cc @@ -36,12 +36,6 @@ TEST_F(ContentSettingsObserverTest, WhitelistedSchemes) { WebSecurityOrigin::create(extension_url), GURL())); - GURL chrome_internal_url = - GURL(std::string(chrome::kChromeInternalScheme).append(end_url)); - EXPECT_TRUE(ContentSettingsObserver::IsWhitelistedForContentSettings( - WebSecurityOrigin::create(chrome_internal_url), - GURL())); - GURL file_url("file:///dir/"); EXPECT_TRUE(ContentSettingsObserver::IsWhitelistedForContentSettings( WebSecurityOrigin::create(file_url), -- cgit v1.1