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

chrome/browser/net/chrome_network_delegate.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 "chrome/browser/net/chrome_network_delegate.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 
 #include <vector>
@@ skipping 405 matching lines @@
       request, auth_info, callback, credentials);
 }
 
 bool ChromeNetworkDelegate::OnCanGetCookies(
     const net::URLRequest& request,
     const net::CookieList& cookie_list) {
   // nullptr during tests, or when we're running in the system context.
   if (!cookie_settings_.get())
     return true;
 
-  bool allow = cookie_settings_->IsReadingCookieAllowed(
+  bool allow = cookie_settings_->IsCookieAccessAllowed(
       request.url(), request.first_party_for_cookies());
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
   if (info) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&TabSpecificContentSettings::CookiesRead,
                    info->GetWebContentsGetterForRequest(),
                    request.url(), request.first_party_for_cookies(),
                    cookie_list, !allow));
   }
 
   return allow;
 }
 
 bool ChromeNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
                                            const std::string& cookie_line,
                                            net::CookieOptions* options) {
   // nullptr during tests, or when we're running in the system context.
   if (!cookie_settings_.get())
     return true;
 
-  bool allow = cookie_settings_->IsSettingCookieAllowed(
+  bool allow = cookie_settings_->IsCookieAccessAllowed(
       request.url(), request.first_party_for_cookies());
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(&request);
   if (info) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&TabSpecificContentSettings::CookieChanged,
                    info->GetWebContentsGetterForRequest(),
                    request.url(), request.first_party_for_cookies(),
                    cookie_line, *options, !allow));
@@ skipping 74 matching lines @@
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 }
 
 bool ChromeNetworkDelegate::OnCanEnablePrivacyMode(
     const GURL& url,
     const GURL& first_party_for_cookies) const {
   // nullptr during tests, or when we're running in the system context.
   if (!cookie_settings_.get())
     return false;
 
-  bool reading_cookie_allowed = false;
-  bool setting_cookie_allowed = false;
-  cookie_settings_->GetReadingAndSettingCookieAllowed(
-      url, first_party_for_cookies, &reading_cookie_allowed,
-      &setting_cookie_allowed);
-  bool privacy_mode = !(reading_cookie_allowed && setting_cookie_allowed);
-  return privacy_mode;
+  return !cookie_settings_->IsCookieAccessAllowed(url, first_party_for_cookies);
 }
 
 bool ChromeNetworkDelegate::OnAreExperimentalCookieFeaturesEnabled() const {
   return experimental_web_platform_features_enabled_;
 }
 
 bool ChromeNetworkDelegate::OnAreStrictSecureCookiesEnabled() const {
   const std::string enforce_strict_secure_group =
       base::FieldTrialList::FindFullName("StrictSecureCookies");
   return experimental_web_platform_features_enabled_ ||
@@ skipping 15 matching lines @@
   if (!data_use_aggregator_)
     return;
 
   if (is_data_usage_off_the_record_) {
     data_use_aggregator_->ReportOffTheRecordDataUse(tx_bytes, rx_bytes);
     return;
   }
 
   data_use_aggregator_->ReportDataUse(request, tx_bytes, rx_bytes);
 }