Allow getting both reading/setting cookie settings at one time

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 26ffa8068bacc6f85d71e4f76853652c36457e16..bfd8bb91a867566cb555b4c96c14d36679d3294e 100644
--- a/components/content_settings/core/browser/cookie_settings.h
+++ b/components/content_settings/core/browser/cookie_settings.h
@@ -37,7 +37,7 @@ class CookieSettings : public RefcountedKeyedService {
 
   // Returns the default content setting (CONTENT_SETTING_ALLOW,
   // CONTENT_SETTING_BLOCK, or CONTENT_SETTING_SESSION_ONLY) for cookies. If
-  // |provider_id| is not NULL, the id of the provider which provided the
+  // |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.
@@ -57,6 +57,11 @@ class CookieSettings : public RefcountedKeyedService {
   bool IsSettingCookieAllowed(const GURL& url,
                               const GURL& first_party_url) const;
 
+  void GetReadingAndSettingCookieAllowed(const GURL& url,

[Devlin, 2016/11/16 20:12:00]

drive-by - function comment?  Particularly since thread-safety in this class
isn't always apparent (some functions are safe to be called on any thread,
others only on the UI thread, etc).

[Charlie Harrison, 2016/11/16 22:04:15]

Done.

+                                         const GURL& first_party_url,
+                                         bool* reading_cookie_allowed,
+                                         bool* setting_cookie_allowed) const;
+
   // Returns true if the cookie set by a page identified by |url| should be
   // session only. Querying this only makes sense if |IsSettingCookieAllowed|
   // has returned true.
@@ -66,7 +71,7 @@ class CookieSettings : public RefcountedKeyedService {
 
   // 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-NULL outparam.
+  // must be a non-nullptr outparam.
   //
   // This may be called on any thread.
   void GetCookieSettings(ContentSettingsForOneType* settings) const;
@@ -95,11 +100,11 @@ class CookieSettings : public RefcountedKeyedService {
   void ShutdownOnUIThread() override;
 
   // A helper for applying third party cookie blocking rules.
-  ContentSetting GetCookieSetting(
-      const GURL& url,
-      const GURL& first_party_url,
-      bool setting_cookie,
-      content_settings::SettingSource* source) const;
+  void GetCookieSetting(const GURL& url,
+                        const GURL& first_party_url,
+                        content_settings::SettingSource* source,
+                        ContentSetting* reading_cookie,
+                        ContentSetting* setting_cookie) const;
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);