Use threadsafe version of GetPermissionStatus in ExtensionSpecialStoragePolicy

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/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/permissions/permission_manager.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/browser/host_content_settings_map.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"
@@ skipping 43 matching lines @@
                    partition->GetQuotaManager(), launch_url,
                    storage::kStorageTypePersistent,
                    base::Bind(&ReportQuotaUsage)));
   }
 }
 
 }  // namespace
 
 ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy(Profile* profile)
     : profile_(profile) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (profile_) {
     cookie_settings_ = CookieSettingsFactory::GetForProfile(profile_).get();
+    permission_manager_ = PermissionManager::Get(profile_);
+    host_content_settings_map_ =
+        HostContentSettingsMapFactory::GetForProfile(profile_);
   }
 }
 
 ExtensionSpecialStoragePolicy::~ExtensionSpecialStoragePolicy() {}
 
 bool ExtensionSpecialStoragePolicy::IsStorageProtected(const GURL& origin) {
   if (origin.SchemeIs(extensions::kExtensionScheme))
     return true;
   base::AutoLock locker(lock_);
   return protected_apps_.Contains(origin);
@@ skipping 39 matching lines @@
   }
   return false;
 }
 
 bool ExtensionSpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) {
   base::AutoLock locker(lock_);
   return isolated_extensions_.Contains(origin);
 }
 
 bool ExtensionSpecialStoragePolicy::IsStorageDurable(const GURL& origin) {
+  if (!host_content_settings_map_ || !permission_manager_)
+    return false;
+
   blink::mojom::PermissionStatus status =
-      PermissionManager::Get(profile_)->GetPermissionStatus(
+      permission_manager_->GetPermissionStatus(
+          host_content_settings_map_.get(),
           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*
@@ skipping 203 matching lines @@
 }
 
 void ExtensionSpecialStoragePolicy::SpecialCollection::Clear() {
   ClearCache();
   extensions_.Clear();
 }
 
 void ExtensionSpecialStoragePolicy::SpecialCollection::ClearCache() {
   cached_results_.clear();
 }