Allow getting both reading/setting cookie settings at one time

chrome/browser/extensions/api/content_settings/content_settings_api.cc

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
index c5e4834a2f27fdc3e6e1c2738570fbfaf5f19b58..2bf058647ac6283334eae727133e085b400a519c 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -154,9 +154,8 @@ ContentSettingsContentSettingGetFunction::Run() {
   ContentSetting setting;
   if (content_type == CONTENT_SETTINGS_TYPE_COOKIES) {
     // TODO(jochen): Do we return the value for setting or for reading cookies?
-    bool setting_cookie = false;
-    setting = cookie_settings->GetCookieSetting(primary_url, secondary_url,
-                                                setting_cookie, NULL);
+    cookie_settings->GetCookieSetting(primary_url, secondary_url, NULL,

[Bernhard Bauer, 2016/11/16 16:55:45]

While you're here, use nullptr instead of NULL?

[Charlie Harrison, 2016/11/16 17:01:05]

Done (across the whole file).

+                                      nullptr /* reading_setting */, &setting);
   } else {
     setting = map->GetContentSetting(primary_url, secondary_url, content_type,
                                      resource_identifier);