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

components/content_settings/core/browser/cookie_settings.h

 // 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.
 
 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_COOKIE_SETTINGS_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_COOKIE_SETTINGS_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 25 matching lines @@
 
   // Returns the default content setting (CONTENT_SETTING_ALLOW,
   // CONTENT_SETTING_BLOCK, or CONTENT_SETTING_SESSION_ONLY) for cookies. If
   // |provider_id| is not nullptr, the id of the provider which provided the
   // default setting is assigned to it.
   //
   // This may be called on any thread.
   ContentSetting GetDefaultCookieSetting(std::string* provider_id) const;
 
   // Returns true if the page identified by (|url|, |first_party_url|) is
-  // allowed to read cookies.
+  // allowed to access cookies.

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

nit: Maybe at this one place, I would actually say "access (i.e. read or write)
cookies" to be clear that this is the setting for both, especially if people
were used to the previous model.

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

Good idea. Done. I'll add it to the net/ interface too.

   //
   // This may be called on any thread.
-  bool IsReadingCookieAllowed(const GURL& url,
-                              const GURL& first_party_url) const;
-
-  // Returns true if the page identified by (|url|, |first_party_url|) is
-  // allowed to set cookies (permanent or session only).
-  //
-  // This may be called on any thread.
-  bool IsSettingCookieAllowed(const GURL& url,
-                              const GURL& first_party_url) const;
-
-  // Gets the results from IsReadingCookieAllowed and IsSettingCookieAllowed in
-  // a performance efficient way.
-  //
-  // This may be called on any thread.
-  void GetReadingAndSettingCookieAllowed(const GURL& url,
-                                         const GURL& first_party_url,
-                                         bool* reading_cookie_allowed,
-                                         bool* setting_cookie_allowed) const;
+  bool IsCookieAccessAllowed(const GURL& url,
+                             const GURL& first_party_url) const;
 
   // Returns true if the cookie set by a page identified by |url| should be
-  // session only. Querying this only makes sense if |IsSettingCookieAllowed|
+  // session only. Querying this only makes sense if |IsCookieAccessAllowed|
   // has returned true.
   //
   // This may be called on any thread.
   bool IsCookieSessionOnly(const GURL& url) const;
 
   // Returns all patterns with a non-default cookie setting, mapped to their
   // actual settings, in the precedence order of the setting rules. |settings|
   // must be a non-nullptr outparam.
   //
   // This may be called on any thread.
@@ skipping 19 matching lines @@
 
   // Detaches the |CookieSettings| from |PrefService|. This methods needs to be
   // called before destroying the service. Afterwards, only const methods can be
   // called.
   void ShutdownOnUIThread() override;
 
   // A helper for applying third party cookie blocking rules.
   void GetCookieSetting(const GURL& url,
                         const GURL& first_party_url,
                         content_settings::SettingSource* source,
-                        ContentSetting* reading_cookie,
-                        ContentSetting* setting_cookie) const;
+                        ContentSetting* cookie_setting) const;
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
  private:
   ~CookieSettings() override;
 
   void OnBlockThirdPartyCookiesChanged();
 
   // Returns true if the "block third party cookies" preference is set.
   //
@@ skipping 10 matching lines @@
   mutable base::Lock lock_;
 
   bool block_third_party_cookies_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieSettings);
 };
 
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_COOKIE_SETTINGS_H_