Switching ExtensionSpecialStoragePolicy::IsStorageDurable to use DurableStoragePermissionContext.

chrome/browser/extensions/extension_special_storage_policy.cc

 // Copyright (c) 2012 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_special_storage_policy.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
+#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/url_constants.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/permission_type.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/app_isolation_info.h"
 #include "extensions/common/manifest_handlers/content_capabilities_handler.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "storage/browser/quota/quota_manager.h"
 #include "storage/common/quota/quota_status_code.h"
@@ skipping 37 matching lines @@
         base::Bind(&storage::QuotaManager::GetUsageAndQuotaForWebApps,
                    partition->GetQuotaManager(), launch_url,
                    storage::kStorageTypePersistent,
                    base::Bind(&ReportQuotaUsage)));
   }
 }
 
 }  // namespace
 
 ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy(
-    content_settings::CookieSettings* cookie_settings)
-    : cookie_settings_(cookie_settings) {
+    content::BrowserContext* browser_context)
+    : browser_context_(browser_context) {
+  if (browser_context_) {
+    Profile* profile = Profile::FromBrowserContext(browser_context_);
+    cookie_settings_ = CookieSettingsFactory::GetForProfile(profile).get();
+  }
 }
 
 ExtensionSpecialStoragePolicy::~ExtensionSpecialStoragePolicy() {}
 
 bool ExtensionSpecialStoragePolicy::IsStorageProtected(const GURL& origin) {
   if (origin.SchemeIs(extensions::kExtensionScheme))
     return true;
   base::AutoLock locker(lock_);
   return protected_apps_.Contains(origin);
 }
 
 bool ExtensionSpecialStoragePolicy::IsStorageUnlimited(const GURL& origin) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUnlimitedStorage))
     return true;
 
   if (origin.SchemeIs(content::kChromeDevToolsScheme) &&
       origin.host_piece() == chrome::kChromeUIDevToolsHost)
     return true;
 
   base::AutoLock locker(lock_);
   return unlimited_extensions_.Contains(origin) ||
          content_capabilities_unlimited_extensions_.GrantsCapabilitiesTo(
              origin);
 }
 
 bool ExtensionSpecialStoragePolicy::IsStorageSessionOnly(const GURL& origin) {
-  if (cookie_settings_.get() == NULL)
+  if (cookie_settings_ == NULL)

[pfeldman, 2016/09/23 17:12:20]

Since you touch those lines, you could migrate them to nullptr.

     return false;
   return cookie_settings_->IsCookieSessionOnly(origin);
 }
 
 bool ExtensionSpecialStoragePolicy::CanQueryDiskSize(const GURL& origin) {
   base::AutoLock locker(lock_);
   return installed_apps_.Contains(origin);
 }
 
 bool ExtensionSpecialStoragePolicy::HasSessionOnlyOrigins() {
-  if (cookie_settings_.get() == NULL)
+  if (cookie_settings_ == NULL)
     return false;
   if (cookie_settings_->GetDefaultCookieSetting(NULL) ==
       CONTENT_SETTING_SESSION_ONLY)
     return true;
   ContentSettingsForOneType entries;
   cookie_settings_->GetCookieSettings(&entries);
   for (size_t i = 0; i < entries.size(); ++i) {
     if (entries[i].setting == CONTENT_SETTING_SESSION_ONLY)
       return true;
   }
   return false;
 }
 
 bool ExtensionSpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) {
   base::AutoLock locker(lock_);
   return isolated_extensions_.Contains(origin);
 }
 
 bool ExtensionSpecialStoragePolicy::IsStorageDurable(const GURL& origin) {
-  return cookie_settings_->IsStorageDurable(origin);
+  Profile* profile = Profile::FromBrowserContext(browser_context_);

[pfeldman, 2016/09/23 17:12:20]

Just store a pointer to the profile, no need to convert all the time.

+  blink::mojom::PermissionStatus status =
+      PermissionManager::Get(profile)->GetPermissionStatus(
+          content::PermissionType::DURABLE_STORAGE, origin, origin);
+  return status == blink::mojom::PermissionStatus::GRANTED;
 }
 
 bool ExtensionSpecialStoragePolicy::NeedsProtection(
     const extensions::Extension* extension) {
   return extension->is_hosted_app() && !extension->from_bookmark();
 }
 
 const extensions::ExtensionSet*
 ExtensionSpecialStoragePolicy::ExtensionsProtectingOrigin(
     const GURL& origin) {
@@ skipping 204 matching lines @@
 }
 
 void ExtensionSpecialStoragePolicy::SpecialCollection::Clear() {
   ClearCache();
   extensions_.Clear();
 }
 
 void ExtensionSpecialStoragePolicy::SpecialCollection::ClearCache() {
   base::STLDeleteValues(&cached_results_);
 }