Unify the "get" and "set" cookie access settings.

components/content_settings/core/browser/cookie_settings.cc

 // Copyright (c) 2012 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 "components/content_settings/core/browser/cookie_settings.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ skipping 38 matching lines @@
       base::Bind(&CookieSettings::OnBlockThirdPartyCookiesChanged,
                  base::Unretained(this)));
 }
 
 ContentSetting CookieSettings::GetDefaultCookieSetting(
     std::string* provider_id) const {
   return host_content_settings_map_->GetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_COOKIES, provider_id);
 }
 
-bool CookieSettings::IsReadingCookieAllowed(const GURL& url,
-                                            const GURL& first_party_url) const {
-  ContentSetting reading_setting;
-  GetCookieSetting(url, first_party_url, nullptr, &reading_setting,
-                   nullptr /* setting_cookie */);
-  return IsAllowed(reading_setting);
-}
-
-bool CookieSettings::IsSettingCookieAllowed(const GURL& url,
-                                            const GURL& first_party_url) const {
-  ContentSetting setting_setting;
-  GetCookieSetting(url, first_party_url, nullptr, nullptr /* reading_cookie */,
-                   &setting_setting);
-  return IsAllowed(setting_setting);
-}
-
-void CookieSettings::GetReadingAndSettingCookieAllowed(
-    const GURL& url,
-    const GURL& first_party_url,
-    bool* reading_cookie_allowed,
-    bool* setting_cookie_allowed) const {
-  ContentSetting reading_setting;
-  ContentSetting setting_setting;
-  GetCookieSetting(url, first_party_url, nullptr, &reading_setting,
-                   &setting_setting);
-  *reading_cookie_allowed = IsAllowed(reading_setting);
-  *setting_cookie_allowed = IsAllowed(setting_setting);
+bool CookieSettings::IsCookieAccessAllowed(const GURL& url,
+                                           const GURL& first_party_url) const {
+  ContentSetting setting;
+  GetCookieSetting(url, first_party_url, nullptr, &setting);
+  return IsAllowed(setting);
 }
 
 bool CookieSettings::IsCookieSessionOnly(const GURL& origin) const {
   ContentSetting setting;
-  GetCookieSetting(origin, origin, nullptr, nullptr, &setting);
+  GetCookieSetting(origin, origin, nullptr, &setting);
   DCHECK(IsValidSetting(setting));
   return (setting == CONTENT_SETTING_SESSION_ONLY);
 }
 
 void CookieSettings::GetCookieSettings(
     ContentSettingsForOneType* settings) const {
   host_content_settings_map_->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_COOKIES, std::string(), settings);
 }
 
@@ skipping 35 matching lines @@
 }
 
 void CookieSettings::ShutdownOnUIThread() {
   DCHECK(thread_checker_.CalledOnValidThread());
   pref_change_registrar_.RemoveAll();
 }
 
 void CookieSettings::GetCookieSetting(const GURL& url,
                                       const GURL& first_party_url,
                                       content_settings::SettingSource* source,
-                                      ContentSetting* reading_cookie,
-                                      ContentSetting* setting_cookie) const {
+                                      ContentSetting* cookie_setting) const {
+  DCHECK(cookie_setting);
   // Auto-allow in extensions or for WebUI embedded in a secure origin.
   if (first_party_url.SchemeIs(kChromeUIScheme) &&
       url.SchemeIsCryptographic()) {
-    if (reading_cookie)
-      *reading_cookie = CONTENT_SETTING_ALLOW;
-    if (setting_cookie)
-      *setting_cookie = CONTENT_SETTING_ALLOW;
+    *cookie_setting = CONTENT_SETTING_ALLOW;
     return;
   }
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   if (url.SchemeIs(extension_scheme_) &&
       first_party_url.SchemeIs(extension_scheme_)) {
-    if (reading_cookie)
-      *reading_cookie = CONTENT_SETTING_ALLOW;
-    if (setting_cookie)
-      *setting_cookie = CONTENT_SETTING_ALLOW;
+    *cookie_setting = CONTENT_SETTING_ALLOW;
     return;
   }
 #endif
 
   // First get any host-specific settings.
   SettingInfo info;
   std::unique_ptr<base::Value> value =
       host_content_settings_map_->GetWebsiteSetting(
           url, first_party_url, CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
           &info);
   if (source)
     *source = info.source;
 
   // If no explicit exception has been made and third-party cookies are blocked
   // by default, apply CONTENT_SETTING_BLOCKED.
   bool block_third = info.primary_pattern.MatchesAllHosts() &&
                      info.secondary_pattern.MatchesAllHosts() &&
                      ShouldBlockThirdPartyCookies() &&
                      !first_party_url.SchemeIs(extension_scheme_);
   net::StaticCookiePolicy policy(
       net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES);
 
   // We should always have a value, at least from the default provider.
   DCHECK(value.get());
   ContentSetting setting = ValueToContentSetting(value.get());
-  if (reading_cookie) {
-    bool block =
-        block_third && policy.CanGetCookies(url, first_party_url) != net::OK;
-    *reading_cookie = block ? CONTENT_SETTING_BLOCK : setting;
-  }
-  if (setting_cookie) {
-    bool block =
-        block_third && policy.CanSetCookie(url, first_party_url) != net::OK;
-    *setting_cookie = block ? CONTENT_SETTING_BLOCK : setting;
-  }
+  bool block =
+      block_third && policy.CanAccessCookies(url, first_party_url) != net::OK;
+  *cookie_setting = block ? CONTENT_SETTING_BLOCK : setting;

[msramek, 2017/01/25 14:41:30]

Please add a DCHECK for this pointer as well.

[falken, 2017/01/25 14:55:51]

|cookie_setting| is already DCHECK'd at the beginning of the function... do you
want another DCHECK here?

[msramek, 2017/01/25 15:03:23]

Nope! Sorry, looked at it wrong the first time.

[falken, 2017/01/25 15:05:40]

Acknowledged.

 }
 
 CookieSettings::~CookieSettings() {
 }
 
 void CookieSettings::OnBlockThirdPartyCookiesChanged() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   base::AutoLock auto_lock(lock_);
   block_third_party_cookies_ = pref_change_registrar_.prefs()->GetBoolean(
       prefs::kBlockThirdPartyCookies);
 }
 
 bool CookieSettings::ShouldBlockThirdPartyCookies() const {
   base::AutoLock auto_lock(lock_);
   return block_third_party_cookies_;
 }
 
 }  // namespace content_settings