Remove some NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED from c/b/extensions Part2

chrome/browser/extensions/extension_infobar_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INFOBAR_DELEGATE_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "base/scoped_observer.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "extensions/browser/extension_registry_observer.h"
 
 class Browser;
 class GURL;
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
+class ExtensionRegistry;
 class ExtensionViewHost;
 }
 
 // The InfobarDelegate for creating and managing state for the ExtensionInfobar
 // plus monitor when the extension goes away.
 class ExtensionInfoBarDelegate : public infobars::InfoBarDelegate,
-                                 public content::NotificationObserver {
+                                 public content::NotificationObserver,
+                                 public extensions::ExtensionRegistryObserver {
  public:
   virtual ~ExtensionInfoBarDelegate();
 
   // Creates an extension infobar and delegate and adds the infobar to the
   // infobar service for |web_contents|.
   static void Create(content::WebContents* web_contents,
                      Browser* browser,
                      const extensions::Extension* extension,
                      const GURL& url,
                      int height);
@@ skipping 13 matching lines @@
   ExtensionInfoBarDelegate(Browser* browser,
                            const extensions::Extension* extension,
                            const GURL& url,
                            content::WebContents* web_contents,
                            int height);
 
   // Returns an extension infobar that owns |delegate|.
   static scoped_ptr<infobars::InfoBar> CreateInfoBar(
       scoped_ptr<ExtensionInfoBarDelegate> delegate);
 
-  // InfoBarDelegate:
+  // InfoBarDelegate.
   virtual bool EqualsDelegate(
       infobars::InfoBarDelegate* delegate) const OVERRIDE;
   virtual void InfoBarDismissed() OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual ExtensionInfoBarDelegate* AsExtensionInfoBarDelegate() OVERRIDE;
 
-  // content::NotificationObserver:
+  // content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // extensions::ExtensionRegistryObserver.
+  virtual void OnExtensionUnloaded(
+      content::BrowserContext* browser_context,
+      const extensions::Extension* extension,
+      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
+
 #if defined(TOOLKIT_VIEWS)
   Browser* browser_;  // We pass this to the ExtensionInfoBar.
 #endif
 
   // The extension host we are showing the InfoBar for.
   // TODO(pkasting): Should this live on the InfoBar instead?
   scoped_ptr<extensions::ExtensionViewHost> extension_view_host_;
 
   const extensions::Extension* extension_;
   content::NotificationRegistrar registrar_;
 
+  ScopedObserver<extensions::ExtensionRegistry,
+                 extensions::ExtensionRegistryObserver>
+      extension_registry_observer_;
+
   // The requested height of the infobar (in pixels).
   int height_;
 
   // Whether we are currently animating to close. This is used to ignore
   // ExtensionView::PreferredSizeChanged notifications.
   bool closing_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_INFOBAR_DELEGATE_H_