Chromium Code Reviews| 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 95e0719eeaae0de24292da927d0474132e6cce82..d348790109fc323ffc71ff123d7af1ec1fa66f6c 100644 |
| --- a/chrome/browser/extensions/extension_special_storage_policy.cc |
| +++ b/chrome/browser/extensions/extension_special_storage_policy.cc |
| @@ -15,6 +15,8 @@ |
| #include "base/stl_util.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "chrome/browser/content_settings/cookie_settings_factory.h" |
| +#include "chrome/browser/profiles/profile.h" |
| +#include "chrome/browser/storage/durable_storage_permission_context.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
| #include "chrome/common/url_constants.h" |
| @@ -80,8 +82,11 @@ void LogHostedAppUnlimitedStorageUsage( |
| } // namespace |
| ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy( |
| - content_settings::CookieSettings* cookie_settings) |
| - : cookie_settings_(cookie_settings) { |
| + content::BrowserContext* browser_context) |
| + : browser_context_(browser_context) { |
| + |
| + Profile* profile = Profile::FromBrowserContext(browser_context_); |
| + cookie_settings_ = CookieSettingsFactory::GetForProfile(profile).get(); |
| } |
| ExtensionSpecialStoragePolicy::~ExtensionSpecialStoragePolicy() {} |
| @@ -109,7 +114,7 @@ bool ExtensionSpecialStoragePolicy::IsStorageUnlimited(const GURL& origin) { |
| } |
| bool ExtensionSpecialStoragePolicy::IsStorageSessionOnly(const GURL& origin) { |
| - if (cookie_settings_.get() == NULL) |
| + if (cookie_settings_ == NULL) |
| return false; |
| return cookie_settings_->IsCookieSessionOnly(origin); |
| } |
| @@ -120,7 +125,7 @@ bool ExtensionSpecialStoragePolicy::CanQueryDiskSize(const GURL& origin) { |
| } |
| bool ExtensionSpecialStoragePolicy::HasSessionOnlyOrigins() { |
| - if (cookie_settings_.get() == NULL) |
| + if (cookie_settings_ == NULL) |
| return false; |
| if (cookie_settings_->GetDefaultCookieSetting(NULL) == |
| CONTENT_SETTING_SESSION_ONLY) |
| @@ -140,7 +145,12 @@ bool ExtensionSpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) { |
| } |
| bool ExtensionSpecialStoragePolicy::IsStorageDurable(const GURL& origin) { |
| - return cookie_settings_->IsStorageDurable(origin); |
| + Profile* profile = Profile::FromBrowserContext(browser_context_); |
| + std::unique_ptr<DurableStoragePermissionContext> permission_context( |
| + new DurableStoragePermissionContext(profile)); |
|
raymes
2016/09/21 07:23:32
We should go through the PermissionManager, someth
|
| + ContentSetting setting = |
| + permission_context->GetPermissionStatus(origin, origin); |
| + return setting == CONTENT_SETTING_ALLOW; |
| } |
| bool ExtensionSpecialStoragePolicy::NeedsProtection( |