Remove deprecated extension notifications from ProcessManager and use ExtensionRegistry instead.

BUG=354046

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

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

extensions/browser/process_manager.cc

@@ -229,14 +229,11 @@ ProcessManager::ProcessManager(BrowserContext* context,
       devtools_callback_(base::Bind(&ProcessManager::OnDevToolsStateChanged,
                                     base::Unretained(this))),
       last_background_close_sequence_id_(0),
-      weak_ptr_factory_(this) {
+      weak_ptr_factory_(this),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(original_context));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,
                  content::Source<BrowserContext>(original_context));
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<BrowserContext>(original_context));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<BrowserContext>(original_context));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
                  content::Source<BrowserContext>(context));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
@@ -660,33 +657,6 @@ void ProcessManager::Observe(int type,
       break;
     }
 
-    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
-      BrowserContext* context = content::Source<BrowserContext>(source).ptr();
-      ExtensionSystem* system = ExtensionSystem::Get(context);
-      if (system->ready().is_signaled()) {
-        // The extension system is ready, so create the background host.
-        const Extension* extension =
-            content::Details<const Extension>(details).ptr();
-        CreateBackgroundHostForExtensionLoad(this, extension);
-      }
-      break;
-    }
-
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      const Extension* extension =
-          content::Details<UnloadedExtensionInfo>(details)->extension;
-      for (ExtensionHostSet::iterator iter = background_hosts_.begin();
-           iter != background_hosts_.end(); ++iter) {
-        ExtensionHost* host = *iter;
-        if (host->extension_id() == extension->id()) {
-          CloseBackgroundHost(host);
-          break;
-        }
-      }
-      UnregisterExtension(extension->id());
-      break;
-    }
-
     case chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED: {
       ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
       if (background_hosts_.erase(host)) {
@@ -760,6 +730,30 @@ void ProcessManager::Observe(int type,
   }
 }
 
+void ProcessManager::OnExtensionLoaded(content::BrowserContext* browser_context,
+                                       const Extension* extension) {
+  if (ExtensionSystem::Get(browser_context)->ready().is_signaled()) {
+    // The extension system is ready, so create the background host.
+    CreateBackgroundHostForExtensionLoad(this, extension);
+  }
+}
+
+void ProcessManager::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    UnloadedExtensionInfo::Reason reason) {
+  for (ExtensionHostSet::iterator iter = background_hosts_.begin();
+       iter != background_hosts_.end();
+       ++iter) {
+    ExtensionHost* host = *iter;
+    if (host->extension_id() == extension->id()) {
+      CloseBackgroundHost(host);
+      break;
+    }
+  }
+  UnregisterExtension(extension->id());
+}
+
 void ProcessManager::OnDevToolsStateChanged(
     content::DevToolsAgentHost* agent_host,
     bool attached) {

extensions/browser/process_manager.h

@@ -14,9 +14,11 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "base/scoped_observer.h"
 #include "base/time/time.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "extensions/browser/extension_registry_observer.h"
 #include "extensions/common/view_type.h"
 
 class GURL;
@@ -33,12 +35,14 @@ namespace extensions {
 
 class Extension;
 class ExtensionHost;
+class ExtensionRegistry;
 class ProcessManagerObserver;
 
 // Manages dynamic state of running Chromium extensions. There is one instance
 // of this class per Profile. OTR Profiles have a separate instance that keeps
 // track of split-mode extensions only.
-class ProcessManager : public content::NotificationObserver {
+class ProcessManager : public content::NotificationObserver,
+                       public ExtensionRegistryObserver {
  public:
   typedef std::set<extensions::ExtensionHost*> ExtensionHostSet;
   typedef ExtensionHostSet::const_iterator const_iterator;
@@ -158,6 +162,14 @@ class ProcessManager : public content::NotificationObserver {
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // ExtensionRegistryObserver:
+  virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
+                                 const Extension* extension) OVERRIDE;
+  virtual void OnExtensionUnloaded(
+      content::BrowserContext* browser_context,
+      const Extension* extension,
+      UnloadedExtensionInfo::Reason reason) OVERRIDE;
+
   // Load all background pages once the profile data is ready and the pages
   // should be loaded.
   void CreateBackgroundHostsForProfileStartup();
@@ -264,6 +276,9 @@ class ProcessManager : public content::NotificationObserver {
   // Must be last member, see doc on WeakPtrFactory.
   base::WeakPtrFactory<ProcessManager> weak_ptr_factory_;
 
+  ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
+      extension_registry_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(ProcessManager);
 };
 

extensions/browser/process_manager_unittest.cc

@@ -8,20 +8,19 @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/site_instance.h"
-#include "content/public/test/test_browser_context.h"
+#include "extensions/browser/extensions_test_browser_context.h"
 #include "extensions/browser/test_extensions_browser_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserContext;
 using content::SiteInstance;
-using content::TestBrowserContext;
 
 namespace extensions {
 
 namespace {
 
-// An incognito version of a TestBrowserContext.
-class TestBrowserContextIncognito : public TestBrowserContext {
+// An incognito version of a ExtensionsTestBrowserContext.
+class TestBrowserContextIncognito : public ExtensionsTestBrowserContext {
  public:
   TestBrowserContextIncognito() {}
   virtual ~TestBrowserContextIncognito() {}
@@ -59,7 +58,7 @@ class ProcessManagerTest : public testing::Test {
   }
 
  private:
-  TestBrowserContext original_context_;
+  ExtensionsTestBrowserContext original_context_;
   TestBrowserContextIncognito incognito_context_;
   TestExtensionsBrowserClient extensions_browser_client_;
 
@@ -79,12 +78,6 @@ TEST_F(ProcessManagerTest, ExtensionNotificationRegistration) {
   EXPECT_TRUE(IsRegistered(manager1.get(),
                            chrome::NOTIFICATION_EXTENSIONS_READY,
                            original_context()));
-  EXPECT_TRUE(IsRegistered(manager1.get(),
-                           chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                           original_context()));
-  EXPECT_TRUE(IsRegistered(manager1.get(),
-                           chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                           original_context()));
   EXPECT_TRUE(IsRegistered(manager1.get(),
                            chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
                            original_context()));
@@ -96,11 +89,6 @@ TEST_F(ProcessManagerTest, ExtensionNotificationRegistration) {
   EXPECT_EQ(incognito_context(), manager2->GetBrowserContext());
   EXPECT_EQ(0u, manager2->background_hosts().size());
 
-  // Some notifications are observed for the original context.
-  EXPECT_TRUE(IsRegistered(manager2.get(),
-                           chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                           original_context()));
-
   // Some notifications are observed for the incognito context.
   EXPECT_TRUE(IsRegistered(manager2.get(),
                            chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
@@ -135,9 +123,8 @@ TEST_F(ProcessManagerTest, ProcessGrouping) {
   // SiteInstances.
   scoped_ptr<ProcessManager> manager1(
       ProcessManager::Create(original_context()));
-  // NOTE: This context is not associated with the TestExtensionsBrowserClient.
-  // That's OK because we're not testing regular vs. incognito behavior.
-  TestBrowserContext another_context;
+
+  ExtensionsTestBrowserContext another_context;
   scoped_ptr<ProcessManager> manager2(ProcessManager::Create(&another_context));
 
   // Extensions with common origins ("scheme://id/") should be grouped in the