Changing third-party cookie blocking: strict by default.

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 <list>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 190 matching lines @@
   if (ShouldAllowAllContent(first_party_url, CONTENT_SETTINGS_TYPE_COOKIES))
     return CONTENT_SETTING_ALLOW;
 
   // First get any host-specific settings.
   ContentSetting setting = GetNonDefaultContentSetting(url,
       first_party_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
 
   // If no explicit exception has been made and third-party cookies are blocked
   // by default, apply that rule.
   if (setting == CONTENT_SETTING_DEFAULT && BlockThirdPartyCookies()) {
-    bool strict = CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kBlockReadingThirdPartyCookies);
-    net::StaticCookiePolicy policy(strict ?
-        net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES :
-        net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
+    net::StaticCookiePolicy policy(
+        net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES);

[jochen (gone - plz use gerrit), 2011/09/28 07:46:48]

I think it would be preferable to keep a pref so you can chose which behavior
you want using an extension API

     int rv;
     if (setting_cookie)
       rv = policy.CanSetCookie(url, first_party_url);
     else
       rv = policy.CanGetCookies(url, first_party_url);
     DCHECK_NE(net::ERR_IO_PENDING, rv);
     if (rv != net::OK)
       setting = CONTENT_SETTING_BLOCK;
   }
 
@@ skipping 360 matching lines @@
 void HostContentSettingsMap::MigrateObsoleteCookiePref() {
   if (prefs_->HasPrefPath(prefs::kCookieBehavior)) {
     int cookie_behavior = prefs_->GetInteger(prefs::kCookieBehavior);
     prefs_->ClearPref(prefs::kCookieBehavior);
     if (!prefs_->HasPrefPath(prefs::kDefaultContentSettings)) {
         SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
             (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ?
                 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW);
     }
     if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) {
-      SetBlockThirdPartyCookies(cookie_behavior ==
-          net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
+      SetBlockThirdPartyCookies(
+          cookie_behavior ==
+              net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES ||
+          cookie_behavior ==
+              net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES);

[jochen (gone - plz use gerrit), 2011/09/28 07:46:48]

we don't write this pref key, so it should never be
BLOCK_ALL_THIRD_PARTY_COOKIES

     }
   }
 }