Hook up extension apps notification permission, take two

chrome/browser/extensions/extensions_service.cc

 // Copyright (c) 2010 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/extensions_service.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
@@ skipping 560 matching lines @@
         NewRunnableMethod(
         backend_.get(),
         &ExtensionsServiceBackend::CheckExternalUninstall,
         scoped_refptr<ExtensionsService>(this),
         info.extension_id,
         info.extension_location));
   }
 }
 
 void ExtensionsService::NotifyExtensionLoaded(Extension* extension) {
-  LOG(INFO) << "Sending EXTENSION_LOADED";
-
-  // The ChromeURLRequestContext needs to be first to know that the extension
+  // The ChromeURLRequestContexts need to be first to know that the extension
   // was loaded, otherwise a race can arise where a renderer that is created
   // for the extension may try to load an extension URL with an extension id
-  // that the request context doesn't yet know about.
-  if (profile_ && !profile_->IsOffTheRecord()) {
-    ChromeURLRequestContextGetter* context_getter =
-        static_cast<ChromeURLRequestContextGetter*>(
-            profile_->GetRequestContext());
-    if (context_getter) {
-      ChromeThread::PostTask(
-          ChromeThread::IO, FROM_HERE,
-          NewRunnableMethod(
-              context_getter,
-              &ChromeURLRequestContextGetter::OnNewExtensions,
-              extension->id(),
-              new ChromeURLRequestContext::ExtensionInfo(
-                  extension->path(),
-                  extension->default_locale(),
-                  std::vector<URLPattern>(),
-                  extension->api_permissions())));
-    }
+  // that the request context doesn't yet know about. The profile is responsible
+  // for ensuring its URLRequestContexts appropriately discover the loaded
+  // extension.
+  if (profile_) {
+    profile_->RegisterExtensionWithRequestContexts(extension);
 
     // Check if this permission requires unlimited storage quota
     if (extension->HasApiPermission(Extension::kUnlimitedStoragePermission)) {
       string16 origin_identifier =
           webkit_database::DatabaseUtil::GetOriginIdentifier(extension->url());
       ChromeThread::PostTask(
           ChromeThread::FILE, FROM_HERE,
           NewRunnableMethod(
               profile_->GetDatabaseTracker(),
               &webkit_database::DatabaseTracker::SetOriginQuotaInMemory,
               origin_identifier,
               kint64max));
     }
   }
 
+  LOG(INFO) << "Sending EXTENSION_LOADED";
+
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_LOADED,
       Source<Profile>(profile_),
       Details<Extension>(extension));
 }
 
 void ExtensionsService::NotifyExtensionUnloaded(Extension* extension) {
   LOG(INFO) << "Sending EXTENSION_UNLOADED";
 
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_UNLOADED,
       Source<Profile>(profile_),
       Details<Extension>(extension));
 
-  if (profile_ && !profile_->IsOffTheRecord()) {
-    ChromeURLRequestContextGetter* context_getter =
-        static_cast<ChromeURLRequestContextGetter*>(
-            profile_->GetRequestContext());
-    if (context_getter) {
+  if (profile_) {
+    profile_->UnregisterExtensionWithRequestContexts(extension);
+
+    // Check if this permission required unlimited storage quota, reset its
+    // in-memory quota.
+    if (extension->HasApiPermission(Extension::kUnlimitedStoragePermission)) {
+      string16 origin_identifier =
+          webkit_database::DatabaseUtil::GetOriginIdentifier(extension->url());
       ChromeThread::PostTask(
-          ChromeThread::IO, FROM_HERE,
+          ChromeThread::FILE, FROM_HERE,
           NewRunnableMethod(
-              context_getter,
-              &ChromeURLRequestContextGetter::OnUnloadedExtension,
-              extension->id()));
+              profile_->GetDatabaseTracker(),
+              &webkit_database::DatabaseTracker::ResetOriginQuotaInMemory,
+              origin_identifier));
     }
   }
 }
 
 void ExtensionsService::UpdateExtensionBlacklist(
   const std::vector<std::string>& blacklist) {
   // Use this set to indicate if an extension in the blacklist has been used.
   std::set<std::string> blacklist_set;
   for (unsigned int i = 0; i < blacklist.size(); ++i) {
     if (Extension::IdIsValid(blacklist[i])) {
@@ skipping 593 matching lines @@
   // Finish installing on UI thread.
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(
           frontend_,
           &ExtensionsService::ContinueLoadAllExtensions,
           extensions_to_reload,
           start_time,
           true));
 }