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

components/content_settings/core/browser/cookie_settings.h

Index: components/content_settings/core/browser/cookie_settings.h
diff --git a/components/content_settings/core/browser/cookie_settings.h b/components/content_settings/core/browser/cookie_settings.h
index b1653f37a5aa772ac0cf8fc1278aee7e8d27c9ff..5a3b6e2cbb8cb514d18b45f729a2cc5a75d2d658 100644
--- a/components/content_settings/core/browser/cookie_settings.h
+++ b/components/content_settings/core/browser/cookie_settings.h
@@ -43,30 +43,14 @@ class CookieSettings : public RefcountedKeyedService {
   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.
@@ -106,8 +90,7 @@ class CookieSettings : public RefcountedKeyedService {
   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);