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..405ad5b0ecc99ffa9cfbf6e816789b7d38867f64 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -53,7 +53,7 @@ bool RemoveContentType(base::ListValue* args,
     return false;
   // We remove the ContentSettingsType parameter since this is added by the
   // renderer, and is not part of the JSON schema.
-  args->Remove(0, NULL);
+  args->Remove(0, nullptr);
   *content_type =
       extensions::content_settings_helpers::StringToContentSettingsType(
           content_type_str);
@@ -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, nullptr,
+                                      nullptr /* reading_setting */, &setting);
   } else {
     setting = map->GetContentSetting(primary_url, secondary_url, content_type,
                                      resource_identifier);