Make third-party cookie blocking strict by default

chrome/browser/content_settings/cookie_settings.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/cookie_settings.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 201 matching lines @@
       host_content_settings_map_->GetContentSettingValue(
           url, first_party_url, CONTENT_SETTINGS_TYPE_COOKIES, "",
           &primary_pattern, &secondary_pattern));
 
   // If no explicit exception has been made and third-party cookies are blocked
   // by default, apply that rule.
   if (primary_pattern == ContentSettingsPattern::Wildcard() &&
       secondary_pattern == ContentSettingsPattern::Wildcard() &&
       ShouldBlockThirdPartyCookies() &&
       !first_party_url.SchemeIs(chrome::kExtensionScheme)) {
-    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);
+    bool not_strict = CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kOnlyBlockSettingThirdPartyCookies);
+    net::StaticCookiePolicy policy(not_strict ?
+        net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES :
+        net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES);
     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)
       return CONTENT_SETTING_BLOCK;
   }
 
   // We should always have a value, at least from the default provider.
   DCHECK(value.get());
   return content_settings::ValueToContentSetting(value.get());
 }
 
 // static
 void CookieSettings::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kBlockThirdPartyCookies,
                              false,
                              PrefService::SYNCABLE_PREF);
 }
 
 bool CookieSettings::ShouldBlockThirdPartyCookies() const {
   base::AutoLock auto_lock(lock_);
   return block_third_party_cookies_;
 }