Remove deprecated extension notifications from state_store.*.

chrome/browser/extensions/state_store.cc

 // Copyright (c) 2012 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/state_store.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 
 namespace {
 
 // Delay, in seconds, before we should open the State Store database. We
 // defer it to avoid slowing down startup. See http://crbug.com/161848
 const int kInitDelaySeconds = 1;
 
 std::string GetFullKey(const std::string& extension_id,
                        const std::string& key) {
@@ skipping 37 matching lines @@
   ready_ = true;
 
   for (size_t i = 0; i < pending_tasks_.size(); ++i)
     pending_tasks_[i].Run();
   pending_tasks_.clear();
 }
 
 StateStore::StateStore(Profile* profile,
                        const base::FilePath& db_path,
                        bool deferred_load)
-    : db_path_(db_path), task_queue_(new DelayedTaskQueue()) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED,
-                 content::Source<Profile>(profile));
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
-                 content::Source<Profile>(profile));
+    : db_path_(db_path),
+      task_queue_(new DelayedTaskQueue()),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(profile));
 
   if (deferred_load) {
     // Don't Init until the first page is loaded or the session restored.
     registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                    content::NotificationService::
                        AllBrowserContextsAndSources());
     registrar_.Add(this, chrome::NOTIFICATION_SESSION_RESTORE_DONE,
                    content::NotificationService::
                        AllBrowserContextsAndSources());
   } else {
     Init();
   }
 }
 
 StateStore::StateStore(Profile* profile, scoped_ptr<ValueStore> value_store)
-    : store_(value_store.Pass()), task_queue_(new DelayedTaskQueue()) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED,
-                 content::Source<Profile>(profile));
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
-                 content::Source<Profile>(profile));
+    : store_(value_store.Pass()),
+      task_queue_(new DelayedTaskQueue()),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(profile));
 
   // This constructor is for testing. No need to delay Init.
   Init();
 }
 
 StateStore::~StateStore() {
 }
 
 void StateStore::RegisterKey(const std::string& key) {
   registered_keys_.insert(key);
@@ skipping 21 matching lines @@
   task_queue_->InvokeWhenReady(
       base::Bind(&ValueStoreFrontend::Remove, base::Unretained(&store_),
                  GetFullKey(extension_id, key)));
 }
 
 bool StateStore::IsInitialized() const { return task_queue_->ready(); }
 
 void StateStore::Observe(int type,
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED:
-      RemoveKeysForExtension(
-          content::Details<const InstalledExtensionInfo>(details)->extension->
-              id());
-      break;
-    case chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED:
-      RemoveKeysForExtension(
-          content::Details<const Extension>(details)->id());
-      break;
-    case chrome::NOTIFICATION_SESSION_RESTORE_DONE:
-    case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME:
-      registrar_.Remove(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
-                        content::NotificationService::AllSources());
-      registrar_.Remove(this, chrome::NOTIFICATION_SESSION_RESTORE_DONE,
-                        content::NotificationService::AllSources());
-      base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
-          base::Bind(&StateStore::Init, AsWeakPtr()),
-          base::TimeDelta::FromSeconds(kInitDelaySeconds));
-      break;
-    default:
-      NOTREACHED();
-      return;
-  }
+  DCHECK(type == chrome::NOTIFICATION_SESSION_RESTORE_DONE ||
+         type == content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME);
+  registrar_.RemoveAll();
+
+  base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
+      base::Bind(&StateStore::Init, AsWeakPtr()),
+      base::TimeDelta::FromSeconds(kInitDelaySeconds));
+}
+
+void StateStore::OnExtensionWillBeInstalled(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    bool is_update,
+    bool from_ephemeral,
+    const std::string& old_name) {
+  RemoveKeysForExtension(extension->id());
+}
+
+void StateStore::OnExtensionUninstalled(
+    content::BrowserContext* browser_context,
+    const Extension* extension) {
+  RemoveKeysForExtension(extension->id());
 }
 
 void StateStore::Init() {
   if (!db_path_.empty())
     store_.Init(db_path_);
   task_queue_->SetReady();
 }
 
 void StateStore::RemoveKeysForExtension(const std::string& extension_id) {
   for (std::set<std::string>::iterator key = registered_keys_.begin();
        key != registered_keys_.end(); ++key) {
     task_queue_->InvokeWhenReady(
         base::Bind(&ValueStoreFrontend::Remove, base::Unretained(&store_),
                    GetFullKey(extension_id, *key)));
   }
 }
 
 }  // namespace extensions