Allow getting both reading/setting cookie settings at one time

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 19 matching lines @@
  public:
   // Creates a new CookieSettings instance.
   // The caller is responsible for ensuring that |extension_scheme| is valid for
   // the whole lifetime of this instance.
   CookieSettings(HostContentSettingsMap* host_content_settings_map,
                  PrefService* prefs,
                  const char* extension_scheme);
 
   // 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.
   ContentSetting GetDefaultCookieSetting(std::string* provider_id) const;
 
   // Returns true if the page identified by (|url|, |first_party_url|) is
   // allowed to read cookies.
   //
   // 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;
 
+  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.
   //
   // 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-NULL outparam.
+  // must be a non-nullptr outparam.
   //
   // This may be called on any thread.
   void GetCookieSettings(ContentSettingsForOneType* settings) const;
 
   // Sets the default content setting (CONTENT_SETTING_ALLOW,
   // CONTENT_SETTING_BLOCK, or CONTENT_SETTING_SESSION_ONLY) for cookies.
   //
   // This should only be called on the UI thread.
   void SetDefaultCookieSetting(ContentSetting setting);
 
   // Sets the cookie setting for the given url.
   //
   // This should only be called on the UI thread.
   void SetCookieSetting(const GURL& primary_url, ContentSetting setting);
 
   // Resets the cookie setting for the given url.
   //
   // This should only be called on the UI thread.
   void ResetCookieSetting(const GURL& primary_url);
 
   bool IsStorageDurable(const GURL& origin) const;
 
   // 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.
-  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);
 
  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_