Exempt chrome-extension:// from third-party cookie rules, but not from regular content settings

BUG=99588
TEST=CookieSettingsTest


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

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

1 files changed, 10 insertions, 6 deletions

diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 7f0c44a0..13da43c 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -184,7 +184,7 @@ base::Value* HostContentSettingsMap::GetContentSettingValue(
          resource_identifier.empty());
 
   // Check if the scheme of the requesting url is whitelisted.
-  if (ShouldAllowAllContent(primary_url, content_type))
+  if (ShouldAllowAllContent(primary_url, secondary_url, content_type))
     return Value::CreateIntegerValue(CONTENT_SETTING_ALLOW);
 
   // The list of |content_settings_providers_| is ordered according to their
@@ -405,12 +405,16 @@ void HostContentSettingsMap::AddSettingsForOneType(
 }
 
 bool HostContentSettingsMap::ShouldAllowAllContent(
-    const GURL& url,
+    const GURL& primary_url,
+    const GURL& secondary_url,
     ContentSettingsType content_type) {
   if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
     return false;
-  return url.SchemeIs(chrome::kChromeDevToolsScheme) ||
-         url.SchemeIs(chrome::kChromeInternalScheme) ||
-         url.SchemeIs(chrome::kChromeUIScheme) ||
-         url.SchemeIs(chrome::kExtensionScheme);
+  if (primary_url.SchemeIs(chrome::kExtensionScheme)) {
+    return content_type != CONTENT_SETTINGS_TYPE_COOKIES ||
+        secondary_url.SchemeIs(chrome::kExtensionScheme);
+  }
+  return primary_url.SchemeIs(chrome::kChromeDevToolsScheme) ||
+         primary_url.SchemeIs(chrome::kChromeInternalScheme) ||
+         primary_url.SchemeIs(chrome::kChromeUIScheme);
 }