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

ios/chrome/browser/net/ios_chrome_network_delegate.cc

 // Copyright 2015 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 "ios/chrome/browser/net/ios_chrome_network_delegate.h"
 
 #include <stdlib.h>
 
 #include "base/base_paths.h"
 #include "base/debug/alias.h"
@@ skipping 111 matching lines @@
   return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION;
 }
 
 bool IOSChromeNetworkDelegate::OnCanGetCookies(
     const net::URLRequest& request,
     const net::CookieList& cookie_list) {
   // Null during tests, or when we're running in the system context.
   if (!cookie_settings_)
     return true;
 
-  return cookie_settings_->IsReadingCookieAllowed(
+  return cookie_settings_->IsCookieAccessAllowed(
       request.url(), request.first_party_for_cookies());
 }
 
 bool IOSChromeNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
                                               const std::string& cookie_line,
                                               net::CookieOptions* options) {
   // Null during tests, or when we're running in the system context.
   if (!cookie_settings_)
     return true;
 
-  return cookie_settings_->IsSettingCookieAllowed(
+  return cookie_settings_->IsCookieAccessAllowed(
       request.url(), request.first_party_for_cookies());
 }
 
 bool IOSChromeNetworkDelegate::OnCanAccessFile(
     const net::URLRequest& request,
     const base::FilePath& path) const {
   return true;
 }
 
 bool IOSChromeNetworkDelegate::OnCanEnablePrivacyMode(
     const GURL& url,
     const GURL& first_party_for_cookies) const {
   // Null during tests, or when we're running in the system context.
   if (!cookie_settings_.get())
     return false;
 
-  bool reading_cookie_allowed =
-      cookie_settings_->IsReadingCookieAllowed(url, first_party_for_cookies);
-  bool setting_cookie_allowed =
-      cookie_settings_->IsSettingCookieAllowed(url, first_party_for_cookies);
-  bool privacy_mode = !(reading_cookie_allowed && setting_cookie_allowed);
-  return privacy_mode;
+  return !cookie_settings_->IsCookieAccessAllowed(url, first_party_for_cookies);
 }
 
 bool IOSChromeNetworkDelegate::
     OnCancelURLRequestWithPolicyViolatingReferrerHeader(
         const net::URLRequest& request,
         const GURL& target_url,
         const GURL& referrer_url) const {
   ReportInvalidReferrerSend(target_url, referrer_url);
   return true;
 }