Make third-party cookie blocking strict by default

chrome/browser/content_settings/cookie_settings_unittest.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 "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
@@ skipping 36 matching lines @@
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTING_BLOCK);
   EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(
       kBlockedSite, kBlockedSite));
 }
 
 TEST_F(CookieSettingsTest, CookiesBlockThirdParty) {
   TestingProfile profile;
   CookieSettings* cookie_settings = CookieSettings::GetForProfile(&profile);
   profile.GetPrefs()->SetBoolean(prefs::kBlockThirdPartyCookies, true);
-  EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(
+  EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(
       kBlockedSite, kFirstPartySite));
   EXPECT_FALSE(cookie_settings->IsCookieSessionOnly(kBlockedSite));
   EXPECT_FALSE(cookie_settings->IsSettingCookieAllowed(
       kBlockedSite, kFirstPartySite));
 
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   AutoReset<CommandLine> auto_reset(cmd, *cmd);
-  cmd->AppendSwitch(switches::kBlockReadingThirdPartyCookies);
+  cmd->AppendSwitch(switches::kOnlyBlockSettingThirdPartyCookies);
 
-  EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(
+  EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(
       kBlockedSite, kFirstPartySite));
   EXPECT_FALSE(cookie_settings->IsSettingCookieAllowed(
       kBlockedSite, kFirstPartySite));
 }
 
 TEST_F(CookieSettingsTest, CookiesAllowThirdParty) {
   TestingProfile profile;
   CookieSettings* cookie_settings = CookieSettings::GetForProfile(&profile);
   EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(
       kBlockedSite, kFirstPartySite));
@@ skipping 51 matching lines @@
   EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(
       kAllowedSite, kFirstPartySite));
   EXPECT_FALSE(cookie_settings->IsCookieSessionOnly(kAllowedSite));
 
   // Extensions should always be allowed to use cookies.
   EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(
       kAllowedSite, kExtensionURL));
   EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(
       kAllowedSite, kExtensionURL));
 
-  CommandLine* cmd = CommandLine::ForCurrentProcess();
-  AutoReset<CommandLine> auto_reset(cmd, *cmd);
-  cmd->AppendSwitch(switches::kBlockReadingThirdPartyCookies);
-
-  EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(
-      kAllowedSite, kFirstPartySite));
-  EXPECT_FALSE(cookie_settings->IsCookieSessionOnly(kAllowedSite));
-
   // Extensions should always be allowed to use cookies.
   EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(
       kAllowedSite, kExtensionURL));
   EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(
       kAllowedSite, kExtensionURL));
 }
 
 TEST_F(CookieSettingsTest, CookiesBlockEverything) {
   TestingProfile profile;
   CookieSettings* cookie_settings = CookieSettings::GetForProfile(&profile);
@@ skipping 104 matching lines @@
   CookieSettings* cookie_settings = CookieSettings::GetForProfile(&profile);
   profile.GetPrefs()->SetBoolean(prefs::kBlockThirdPartyCookies, true);
 
   // XHRs stemming from extensions are exempt from third-party cookie blocking
   // rules (as the first party is always the extension's security origin).
   EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(
       kBlockedSite, kExtensionURL));
 }
 
 }  // namespace