HostContentSettingsMap refactoring.

chrome/browser/extensions/extension_content_settings_api.cc

Index: chrome/browser/extensions/extension_content_settings_api.cc
diff --git a/chrome/browser/extensions/extension_content_settings_api.cc b/chrome/browser/extensions/extension_content_settings_api.cc
index b76024e6c056c08b04ecee1ecb09b3a3e19ef729..05a4f92cc051b6597c992fa33cb669c503b3031f 100644
--- a/chrome/browser/extensions/extension_content_settings_api.cc
+++ b/chrome/browser/extensions/extension_content_settings_api.cc
@@ -9,6 +9,7 @@
 #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"
@@ -144,8 +145,12 @@ bool GetContentSettingFunction::RunImpl() {
   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);