HostContentSettingsMap refactoring.

chrome/browser/extensions/extension_content_settings_api.cc

 // Copyright (c) 2011 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/extension_content_settings_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/values.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_content_settings_api_constants.h"
 #include "chrome/browser/extensions/extension_content_settings_helpers.h"
 #include "chrome/browser/extensions/extension_content_settings_store.h"
 #include "chrome/browser/extensions/extension_preference_api_constants.h"
 #include "chrome/browser/extensions/extension_preference_helpers.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_error_utils.h"
@@ skipping 115 matching lines @@
     }
     map = profile()->GetOffTheRecordProfile()->GetHostContentSettingsMap();
   } else {
     map = profile()->GetHostContentSettingsMap();
   }
 
   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 = map->GetCookieContentSetting(primary_url, secondary_url,
-                                           setting_cookie);
+    if (map->GetCookieSettings()->IsCookieAllowed(primary_url, secondary_url,
+                                         setting_cookie)) {

[Bernhard Bauer, 2011/08/28 19:18:49]

Nit: indent

[marja, 2011/09/01 11:03:19]

Done.

+      setting = CONTENT_SETTING_ALLOW;
+    } else {
+      setting = CONTENT_SETTING_BLOCK;
+    }
   } else {
     setting = map->GetContentSetting(primary_url, secondary_url, content_type,
                                      resource_identifier);
   }
 
   DictionaryValue* result = new DictionaryValue();
   result->SetString(keys::kContentSettingKey,
                     helpers::ContentSettingToString(setting));
 
   result_.reset(result);
@@ skipping 139 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(
           &GetResourceIdentifiersFunction::SendResponse, this, true));
 }
 
 // static
 void GetResourceIdentifiersFunction::SetPluginListForTesting(
     webkit::npapi::PluginList* plugin_list) {
   g_plugin_list = plugin_list;
 }