Add TriggerOnUninstalled to ExtensionRegistry.

And change ExtensionToolbarModel to use it instead of NOTIFICATION_EXTENSION_UNINSTALLED.

R=kalman@chromium.org
BUG=354459
TEST=unit_test

Review URL: https://codereview.chromium.org/289073008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272649 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 0 deletions

diff --git a/extensions/browser/extension_registry_unittest.cc b/extensions/browser/extension_registry_unittest.cc
index 8281ee0..5566fff 100644
--- a/extensions/browser/extension_registry_unittest.cc
+++ b/extensions/browser/extension_registry_unittest.cc
@@ -39,11 +39,13 @@ class TestObserver : public ExtensionRegistryObserver {
     loaded_.clear();
     unloaded_.clear();
     installed_.clear();
+    uninstalled_.clear();
   }
 
   const ExtensionList& loaded() { return loaded_; }
   const ExtensionList& unloaded() { return unloaded_; }
   const ExtensionList& installed() { return installed_; }
+  const ExtensionList& uninstalled() { return uninstalled_; }
 
  private:
   virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
@@ -66,9 +68,15 @@ class TestObserver : public ExtensionRegistryObserver {
     installed_.push_back(extension);
   }
 
+  virtual void OnExtensionUninstalled(content::BrowserContext* browser_context,
+                                      const Extension* extension) OVERRIDE {
+    uninstalled_.push_back(extension);
+  }
+
   ExtensionList loaded_;
   ExtensionList unloaded_;
   ExtensionList installed_;
+  ExtensionList uninstalled_;
 };
 
 TEST_F(ExtensionRegistryTest, FillAndClearRegistry) {
@@ -251,6 +259,10 @@ TEST_F(ExtensionRegistryTest, Observer) {
   EXPECT_TRUE(HasSingleExtension(observer.unloaded(), extension.get()));
   observer.Reset();
 
+  registry.TriggerOnUninstalled(extension);
+  EXPECT_TRUE(observer.installed().empty());
+  EXPECT_TRUE(HasSingleExtension(observer.uninstalled(), extension.get()));
+
   registry.RemoveObserver(&observer);
 }