Send notifications on the IO thread when changes are made to the special storage policy. Listen f...

chrome/browser/extensions/extension_special_storage_policy.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_special_storage_policy.h"
 
 #include "base/logging.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/browser_thread.h"
 
 ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy() {}
 
 ExtensionSpecialStoragePolicy::~ExtensionSpecialStoragePolicy() {}
 
 bool ExtensionSpecialStoragePolicy::IsStorageProtected(const GURL& origin) {
   if (origin.SchemeIs(chrome::kExtensionScheme))
     return true;
   base::AutoLock locker(lock_);
   return protected_apps_.Contains(origin);
@@ skipping 13 matching lines @@
 void ExtensionSpecialStoragePolicy::GrantRightsForExtension(
     const Extension* extension) {
   DCHECK(extension);
   if (!extension->is_hosted_app() &&
       !extension->HasAPIPermission(
           ExtensionAPIPermission::kUnlimitedStorage) &&
       !extension->HasAPIPermission(
           ExtensionAPIPermission::kFileBrowserHandler)) {
     return;
   }
-  base::AutoLock locker(lock_);
-  if (extension->is_hosted_app())
-    protected_apps_.Add(extension);
-  if (extension->HasAPIPermission(ExtensionAPIPermission::kUnlimitedStorage))
-    unlimited_extensions_.Add(extension);
-  if (extension->HasAPIPermission(ExtensionAPIPermission::kFileBrowserHandler))
-    file_handler_extensions_.Add(extension);
+  {
+    base::AutoLock locker(lock_);
+    if (extension->is_hosted_app())
+      protected_apps_.Add(extension);
+    if (extension->HasAPIPermission(ExtensionAPIPermission::kUnlimitedStorage))
+      unlimited_extensions_.Add(extension);
+    if (extension->HasAPIPermission(
+            ExtensionAPIPermission::kFileBrowserHandler)) {
+      file_handler_extensions_.Add(extension);
+    }
+  }
+  NotifyChanged();
 }
 
 void ExtensionSpecialStoragePolicy::RevokeRightsForExtension(
     const Extension* extension) {
   DCHECK(extension);
   if (!extension->is_hosted_app() &&
       !extension->HasAPIPermission(
           ExtensionAPIPermission::kUnlimitedStorage) &&
       !extension->HasAPIPermission(
           ExtensionAPIPermission::kFileBrowserHandler)) {
     return;
   }
-  base::AutoLock locker(lock_);
-  if (extension->is_hosted_app())
-    protected_apps_.Remove(extension);
-  if (extension->HasAPIPermission(ExtensionAPIPermission::kUnlimitedStorage))
-    unlimited_extensions_.Remove(extension);
-  if (extension->HasAPIPermission(ExtensionAPIPermission::kFileBrowserHandler))
-    file_handler_extensions_.Remove(extension);
+  {
+    base::AutoLock locker(lock_);
+    if (extension->is_hosted_app())
+      protected_apps_.Remove(extension);
+    if (extension->HasAPIPermission(ExtensionAPIPermission::kUnlimitedStorage))
+      unlimited_extensions_.Remove(extension);
+    if (extension->HasAPIPermission(
+            ExtensionAPIPermission::kFileBrowserHandler)) {
+      file_handler_extensions_.Remove(extension);
+    }
+  }
+  NotifyChanged();
 }
 
 void ExtensionSpecialStoragePolicy::RevokeRightsForAllExtensions() {
-  base::AutoLock locker(lock_);
-  protected_apps_.Clear();
-  unlimited_extensions_.Clear();
-  file_handler_extensions_.Clear();
+  {
+    base::AutoLock locker(lock_);
+    protected_apps_.Clear();
+    unlimited_extensions_.Clear();
+    file_handler_extensions_.Clear();
+  }
+  NotifyChanged();
+}
+
+void ExtensionSpecialStoragePolicy::NotifyChanged() {
+  if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+        NewRunnableMethod(this,
+            &ExtensionSpecialStoragePolicy::NotifyChanged));
+    return;
+  }
+  SpecialStoragePolicy::NotifyObservers();
 }
 
 //-----------------------------------------------------------------------------
 // SpecialCollection helper class
 //-----------------------------------------------------------------------------
 
 ExtensionSpecialStoragePolicy::SpecialCollection::SpecialCollection() {}
 
 ExtensionSpecialStoragePolicy::SpecialCollection::~SpecialCollection() {}
 
@@ skipping 28 matching lines @@
 void ExtensionSpecialStoragePolicy::SpecialCollection::Remove(
     const Extension* extension) {
   cached_results_.clear();
   extensions_.erase(extension->id());
 }
 
 void ExtensionSpecialStoragePolicy::SpecialCollection::Clear() {
   cached_results_.clear();
   extensions_.clear();
 }