Resubmit: Remove deprecated extension notification from WebstoreStartupInstallerTest

chrome/browser/extensions/webstore_startup_installer_browsertest.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 "base/command_line.h"
+#include "base/scoped_observer.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/startup_helper.h"
 #include "chrome/browser/extensions/webstore_installer_test.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_registry_observer.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/value_builder.h"
 #include "net/dns/mock_host_resolver.h"
 #include "url/gurl.h"
 
 using content::WebContents;
 using extensions::DictionaryBuilder;
 using extensions::Extension;
 using extensions::ExtensionBuilder;
@@ skipping 191 matching lines @@
     WebstoreStartupInstallUnpackFailureTest) {
   ExtensionInstallPrompt::g_auto_confirm_for_tests =
       ExtensionInstallPrompt::ACCEPT;
 
   ui_test_utils::NavigateToURL(browser(),
       GenerateTestServerUrl(kAppDomain, "install_unpack_failure.html"));
 
   RunTest("runTest");
 }
 
-class CommandLineWebstoreInstall : public WebstoreStartupInstallerTest,
-                                   public content::NotificationObserver {
+class CommandLineWebstoreInstall
+    : public WebstoreStartupInstallerTest,
+      public content::NotificationObserver,
+      public extensions::ExtensionRegistryObserver {
  public:
   CommandLineWebstoreInstall() : saw_install_(false), browser_open_count_(0) {}
   virtual ~CommandLineWebstoreInstall() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     WebstoreStartupInstallerTest::SetUpOnMainThread();
-    registrar_.Add(
-        this,
-        extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-        content::NotificationService::AllSources());
+    extensions::ExtensionRegistry::Get(browser()->profile())->AddObserver(this);
     registrar_.Add(this, chrome::NOTIFICATION_BROWSER_OPENED,
                    content::NotificationService::AllSources());
   }
 
+  virtual void TearDownOnMainThread() OVERRIDE {
+    extensions::ExtensionRegistry::Get(browser()->profile())
+        ->RemoveObserver(this);
+    WebstoreStartupInstallerTest::TearDownOnMainThread();
+  }
+
   bool saw_install() { return saw_install_; }
 
   int browser_open_count() { return browser_open_count_; }
 
   // NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
-    if (type ==
-        extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED) {
-      const Extension* extension =
-          content::Details<const extensions::InstalledExtensionInfo>(details)->
-              extension;
-      ASSERT_TRUE(extension != NULL);
-      EXPECT_EQ(extension->id(), kTestExtensionId);
-      saw_install_ = true;
-    } else if (type == chrome::NOTIFICATION_BROWSER_OPENED) {
-      browser_open_count_++;
-    } else {
-      ASSERT_TRUE(false) << "Unexpected notification type : " << type;
-    }
+    DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_OPENED);
+    ++browser_open_count_;
+  }
+
+  virtual void OnExtensionWillBeInstalled(
+      content::BrowserContext* browser_context,
+      const extensions::Extension* extension,
+      bool is_update,
+      bool from_ephemeral,
+      const std::string& old_name) OVERRIDE {
+    EXPECT_EQ(extension->id(), kTestExtensionId);
+    saw_install_ = true;
   }
 
   content::NotificationRegistrar registrar_;
 
   // Have we seen an installation notification for kTestExtensionId ?
   bool saw_install_;
 
   // How many NOTIFICATION_BROWSER_OPENED notifications have we seen?
   int browser_open_count_;
 };
@@ skipping 43 matching lines @@
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   command_line->AppendSwitchASCII(
       switches::kLimitedInstallFromWebstore, "2");
   helper.LimitedInstallFromWebstore(*command_line, browser()->profile(),
       base::MessageLoop::QuitWhenIdleClosure());
   base::MessageLoop::current()->Run();
 
   EXPECT_TRUE(saw_install());
   EXPECT_EQ(0, browser_open_count());
 }