Remove deprecated extension notifications from ApiResourceManager

extensions/browser/api/api_resource_manager.h

 // Copyright 2014 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.
 
 #ifndef EXTENSIONS_BROWSER_API_API_RESOURCE_MANAGER_H_
 #define EXTENSIONS_BROWSER_API_API_RESOURCE_MANAGER_H_
 
 #include <map>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
+#include "base/scoped_observer.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/extension_host.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_registry_observer.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/common/extension.h"
 
 namespace extensions {
 
 namespace api {
 class BluetoothSocketApiFunction;
 class BluetoothSocketEventDispatcher;
 }
 
@@ skipping 73 matching lines @@
 //
 //
 // template <>
 // BrowserContextKeyedAPIFactory<ApiResourceManager<Resource> >*
 // ApiResourceManager<Resource>::GetFactoryInstance() {
 //   return g_factory.Pointer();
 // }
 template <class T, typename ThreadingTraits = NamedThreadTraits<T> >
 class ApiResourceManager : public BrowserContextKeyedAPI,
                            public base::NonThreadSafe,
-                           public content::NotificationObserver {
+                           public content::NotificationObserver,
+                           public ExtensionRegistryObserver {
  public:
   explicit ApiResourceManager(content::BrowserContext* context)
-      : data_(new ApiResourceData()) {
-    registrar_.Add(this,
-                   extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                   content::NotificationService::AllSources());
+      : data_(new ApiResourceData()), extension_registry_observer_(this) {
+    extension_registry_observer_.Add(ExtensionRegistry::Get(context));
     registrar_.Add(this,
                    extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED,
                    content::NotificationService::AllSources());
   }
   // For Testing.
   static ApiResourceManager<T, TestThreadTraits<T> >*
   CreateApiResourceManagerForTest(content::BrowserContext* context,
                                   content::BrowserThread::ID thread_id) {
     TestThreadTraits<T>::thread_id_ = thread_id;
     ApiResourceManager<T, TestThreadTraits<T> >* manager =
@@ skipping 46 matching lines @@
                int api_resource_id,
                T* resource) {
     return data_->Replace(extension_id, api_resource_id, resource);
   }
 
  protected:
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
-    switch (type) {
-      case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-        std::string id = content::Details<extensions::UnloadedExtensionInfo>(
-                             details)->extension->id();
-        data_->InitiateExtensionUnloadedCleanup(id);
-        break;
-      }
-      case extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED: {
-        ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
-        data_->InitiateExtensionSuspendedCleanup(host->extension_id());
-        break;
-      }
-    }
+    DCHECK_EQ(extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED, type);
+    ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
+    data_->InitiateExtensionSuspendedCleanup(host->extension_id());
+  }
+
+  // ExtensionRegistryObserver:
+  virtual void OnExtensionUnloaded(
+      content::BrowserContext* browser_context,
+      const Extension* extension,
+      UnloadedExtensionInfo::Reason reason) OVERRIDE {
+    data_->InitiateExtensionUnloadedCleanup(extension->id());
   }
 
  private:
   // TODO(rockot): ApiResourceData could be moved out of ApiResourceManager and
   // we could avoid maintaining a friends list here.
   friend class BluetoothAPI;
   friend class api::BluetoothSocketApiFunction;
   friend class api::BluetoothSocketEventDispatcher;
   friend class core_api::SerialEventDispatcher;
   friend class core_api::TCPServerSocketEventDispatcher;
@@ skipping 180 matching lines @@
 
     int GenerateId() { return next_id_++; }
 
     int next_id_;
     ApiResourceMap api_resource_map_;
     ExtensionToResourceMap extension_resource_map_;
   };
 
   content::NotificationRegistrar registrar_;
   scoped_refptr<ApiResourceData> data_;
+
+  ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
+      extension_registry_observer_;
 };
 
 // With WorkerPoolThreadTraits, ApiResourceManager can be used to manage the
 // lifetime of a set of resources that live on sequenced task runner threads
 // which ApiFunctions use. Examples of such resources are temporary file
 // resources produced by certain API calls.
 //
 // Instead of kThreadId. classes used for tracking such resources should define
 // kSequenceToken and kShutdownBehavior to identify sequence task runner for
 // ApiResourceManager to work on and how pending tasks should behave on
@@ skipping 51 matching lines @@
         ->GetSequencedTaskRunnerWithShutdownBehavior(
             content::BrowserThread::GetBlockingPool()->GetNamedSequenceToken(
                 T::kSequenceToken),
             T::kShutdownBehavior);
   }
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_API_RESOURCE_MANAGER_H_