Remove InstallTracker's extension load, unload observer

chrome/browser/ui/app_list/extension_app_model_builder.cc

Index: chrome/browser/ui/app_list/extension_app_model_builder.cc
diff --git a/chrome/browser/ui/app_list/extension_app_model_builder.cc b/chrome/browser/ui/app_list/extension_app_model_builder.cc
index fdf191cc2126a305335d34c6273ab2ff1d51b1e3..f97fd85a392ee3216baf8ba5a1af1a738c5e9e08 100644
--- a/chrome/browser/ui/app_list/extension_app_model_builder.cc
+++ b/chrome/browser/ui/app_list/extension_app_model_builder.cc
@@ -10,7 +10,6 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
@@ -20,8 +19,8 @@
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/pref_names.h"
@@ -38,11 +37,13 @@ ExtensionAppModelBuilder::ExtensionAppModelBuilder(
       controller_(controller),
       model_(NULL),
       highlighted_app_pending_(false),
-      tracker_(NULL) {
+      tracker_(NULL),
+      extension_registry_(NULL) {
 }
 
 ExtensionAppModelBuilder::~ExtensionAppModelBuilder() {
   OnShutdown();
+  OnShutdown(extension_registry_);
   if (!service_)
     model_->top_level_item_list()->RemoveObserver(this);
 }
@@ -124,7 +125,9 @@ void ExtensionAppModelBuilder::OnInstallFailure(
   model_->DeleteItem(extension_id);
 }
 
-void ExtensionAppModelBuilder::OnExtensionLoaded(const Extension* extension) {
+void ExtensionAppModelBuilder::OnExtensionLoaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension) {
   if (!extensions::ui_util::ShouldDisplayInAppLauncher(extension, profile_))
     return;
 
@@ -145,7 +148,10 @@ void ExtensionAppModelBuilder::OnExtensionLoaded(const Extension* extension) {
   UpdateHighlight();
 }
 
-void ExtensionAppModelBuilder::OnExtensionUnloaded(const Extension* extension) {
+void ExtensionAppModelBuilder::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    extensions::UnloadedExtensionInfo::Reason reason) {
   ExtensionAppItem* item = GetExtensionAppItem(extension->id());
   if (!item)
     return;
@@ -153,7 +159,8 @@ void ExtensionAppModelBuilder::OnExtensionUnloaded(const Extension* extension) {
 }
 
 void ExtensionAppModelBuilder::OnExtensionUninstalled(
-    const Extension* extension) {
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension) {
   if (service_) {
     DVLOG(2) << service_ << ": OnExtensionUninstalled: "
              << extension->id().substr(0, 8);
@@ -185,6 +192,16 @@ void ExtensionAppModelBuilder::OnShutdown() {
   }
 }
 
+void ExtensionAppModelBuilder::OnShutdown(
+    extensions::ExtensionRegistry* registry) {
+  if (!extension_registry_)
+    return;
+
+  DCHECK_EQ(extension_registry_, registry);
+  extension_registry_->RemoveObserver(this);
+  extension_registry_ = NULL;
+}
+
 scoped_ptr<ExtensionAppItem> ExtensionAppModelBuilder::CreateAppItem(
     const std::string& extension_id,
     const std::string& extension_name,
@@ -203,6 +220,7 @@ scoped_ptr<ExtensionAppItem> ExtensionAppModelBuilder::CreateAppItem(
 void ExtensionAppModelBuilder::BuildModel() {
   DCHECK(!tracker_);
   tracker_ = controller_->GetInstallTrackerFor(profile_);
+  extension_registry_ = extensions::ExtensionRegistry::Get(profile_);
 
   PopulateApps();
   UpdateHighlight();
@@ -210,6 +228,9 @@ void ExtensionAppModelBuilder::BuildModel() {
   // Start observing after model is built.
   if (tracker_)
     tracker_->AddObserver(this);
+
+  if (extension_registry_)
+    extension_registry_->AddObserver(this);
 }
 
 void ExtensionAppModelBuilder::PopulateApps() {