| Index: chrome/browser/extensions/extension_special_storage_policy.cc
|
| diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
|
| index 95a2486599bab8b3a7e9c703fc0a8116cbbbc9f7..aad92b2ab9a035985c477a7c227dccff4d6e6600 100644
|
| --- a/chrome/browser/extensions/extension_special_storage_policy.cc
|
| +++ b/chrome/browser/extensions/extension_special_storage_policy.cc
|
| @@ -5,15 +5,15 @@
|
| #include "chrome/browser/extensions/extension_special_storage_policy.h"
|
|
|
| #include "base/logging.h"
|
| -#include "chrome/browser/content_settings/host_content_settings_map.h"
|
| +#include "chrome/browser/content_settings/cookie_settings.h"
|
| #include "chrome/common/content_settings.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "content/browser/browser_thread.h"
|
|
|
| ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy(
|
| - HostContentSettingsMap* host_content_settings_map)
|
| - : host_content_settings_map_(host_content_settings_map) {}
|
| + CookieSettings* cookie_settings)
|
| + : cookie_settings_(cookie_settings) {}
|
|
|
| ExtensionSpecialStoragePolicy::~ExtensionSpecialStoragePolicy() {}
|
|
|
| @@ -30,11 +30,9 @@ bool ExtensionSpecialStoragePolicy::IsStorageUnlimited(const GURL& origin) {
|
| }
|
|
|
| bool ExtensionSpecialStoragePolicy::IsStorageSessionOnly(const GURL& origin) {
|
| - if (host_content_settings_map_ == NULL)
|
| + if (cookie_settings_ == NULL)
|
| return false;
|
| - ContentSetting content_setting = host_content_settings_map_->
|
| - GetCookieContentSetting(origin, origin, true);
|
| - return (content_setting == CONTENT_SETTING_SESSION_ONLY);
|
| + return cookie_settings_->IsCookieSessionOnly(origin);
|
| }
|
|
|
| bool ExtensionSpecialStoragePolicy::IsFileHandler(
|
|
|