Allow getting both reading/setting cookie settings at one time

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

 // 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.
 
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
 
 #include <memory>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 35 matching lines @@
 
 namespace {
 
 bool RemoveContentType(base::ListValue* args,
                        ContentSettingsType* content_type) {
   std::string content_type_str;
   if (!args->GetString(0, &content_type_str))
     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);
   return *content_type != CONTENT_SETTINGS_TYPE_DEFAULT;
 }
 
 }  // namespace
 
 namespace extensions {
 
@@ skipping 80 matching lines @@
         CookieSettingsFactory::GetForProfile(profile->GetOffTheRecordProfile())
             .get();
   } else {
     map = HostContentSettingsMapFactory::GetForProfile(profile);
     cookie_settings = CookieSettingsFactory::GetForProfile(profile).get();
   }
 
   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);
   }
 
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
   std::string setting_string =
       content_settings::ContentSettingToString(setting);
   DCHECK(!setting_string.empty());
   result->SetString(keys::kContentSettingKey, setting_string);
@@ skipping 140 matching lines @@
   SetResult(std::move(list));
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(
           &ContentSettingsContentSettingGetResourceIdentifiersFunction::
           SendResponse,
           this,
           true));
 }
 
 }  // namespace extensions