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 99 matching lines @@
   if (details->HasKey(pref_keys::kIncognitoKey)) {
     EXTENSION_FUNCTION_VALIDATE(
         details->GetBoolean(pref_keys::kIncognitoKey, &incognito));
   }
   if (incognito && !include_incognito()) {
     error_ = pref_keys::kIncognitoErrorMessage;
     return false;
   }
 
   HostContentSettingsMap* map;
+  CookieSettings* cookie_settings;
   if (incognito) {
     if (!profile()->HasOffTheRecordProfile()) {
       // TODO(bauerb): Allow reading incognito content settings
       // outside of an incognito session.
       error_ = keys::kIncognitoSessionOnlyError;
       return false;
     }
     map = profile()->GetOffTheRecordProfile()->GetHostContentSettingsMap();
+    cookie_settings = CookieSettings::GetForProfile(
+        profile()->GetOffTheRecordProfile());
   } else {
     map = profile()->GetHostContentSettingsMap();
+    cookie_settings = CookieSettings::GetForProfile(profile());
   }
+  DCHECK(cookie_settings != NULL);
 
   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 (cookie_settings->IsReadingCookieAllowed(primary_url, secondary_url)) {
+      if (cookie_settings->IsCookieSessionOnly(primary_url))
+        setting = CONTENT_SETTING_SESSION_ONLY;
+      else
+        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;
 }