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

chrome/browser/content_settings/host_content_settings_map.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ skipping 166 matching lines @@
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     ContentSettingsPattern* primary_pattern,
     ContentSettingsPattern* secondary_pattern) const {
   DCHECK(content_settings::SupportsResourceIdentifier(content_type) ||
          resource_identifier.empty());
 
   // Check if the scheme of the requesting url is whitelisted.
-  if (ShouldAllowAllContent(secondary_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
   // precedence.
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
     base::Value* value = content_settings::GetContentSettingValueAndPatterns(
         provider->second, primary_url, secondary_url, content_type,
         resource_identifier, is_off_the_record_,
@@ skipping 200 matching lines @@
     const content_settings::Rule& rule = rule_iterator->Next();
     settings->push_back(ContentSettingPatternSource(
         rule.primary_pattern, rule.secondary_pattern,
         content_settings::ValueToContentSetting(rule.value.get()),
         kProviderNames[provider_type],
         incognito));
   }
 }
 
 bool HostContentSettingsMap::ShouldAllowAllContent(
+    const GURL& first_party_url,

[Bernhard Bauer, 2011/11/04 12:12:42]

I think we should swap these parameters, no? IIRC the first party URL is the
secondary URL for cookies, and for other content types we'll probably want to
use the scheme of the primary URL.

[jochen (gone - plz use gerrit), 2011/11/04 12:24:25]

I still don't like this primary/secondary naming scheme, esp. now that cookie
settings are in another file :-/

anyway, i've renamed the parameters to primary/secondary, so it should be more
clear now, right?

     const GURL& url,
     ContentSettingsType content_type) {
   if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
     return false;
+  if (url.SchemeIs(chrome::kExtensionScheme)) {
+    return content_type != CONTENT_SETTINGS_TYPE_COOKIES ||
+        first_party_url.SchemeIs(chrome::kExtensionScheme);
+  }
   return url.SchemeIs(chrome::kChromeDevToolsScheme) ||
          url.SchemeIs(chrome::kChromeInternalScheme) ||
-         url.SchemeIs(chrome::kChromeUIScheme) ||
-         url.SchemeIs(chrome::kExtensionScheme);
+         url.SchemeIs(chrome::kChromeUIScheme);
 }