Make TabContents own its infobar delegates....

chrome/browser/extensions/extension_infobar_delegate.h

Index: chrome/browser/extensions/extension_infobar_delegate.h
===================================================================
--- chrome/browser/extensions/extension_infobar_delegate.h	(revision 65711)
+++ chrome/browser/extensions/extension_infobar_delegate.h	(working copy)
@@ -18,26 +18,16 @@
 class ExtensionInfoBarDelegate : public InfoBarDelegate,
                                  public NotificationObserver {
  public:
-  // The observer for when the delegate dies.
-  class DelegateObserver {
-   public:
-    virtual void OnDelegateDeleted() = 0;
-
-   protected:
-    virtual ~DelegateObserver() {}
-  };
-
-  ExtensionInfoBarDelegate(Browser* browser, TabContents* contents,
-                           const Extension* extension, const GURL& url);
+  ExtensionInfoBarDelegate(Browser* browser,
+                           TabContents* contents,
+                           const Extension* extension,
+                           const GURL& url);
   ~ExtensionInfoBarDelegate();
 
   const Extension* extension() { return extension_; }
   ExtensionHost* extension_host() { return extension_host_.get(); }
 
-  void set_observer(DelegateObserver* observer) { observer_ = observer; }
-
   // Overridden from InfoBarDelegate:
-  virtual void InfoBarDismissed() { closing_ = true; }
   virtual bool EqualsDelegate(InfoBarDelegate* delegate) const;
   virtual void InfoBarClosed();
   virtual InfoBar* CreateInfoBar();
@@ -49,7 +39,6 @@
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  bool closing() { return closing_; }
  private:
   // The extension host we are showing the InfoBar for. The delegate needs to
   // own this since the InfoBar gets deleted and recreated when you switch tabs
@@ -57,19 +46,12 @@
   // get lost at that point.
   scoped_ptr<ExtensionHost> extension_host_;
 
-  // The observer monitoring when the delegate dies.
-  DelegateObserver* observer_;
-
   const Extension* extension_;
 
   TabContents* tab_contents_;
 
   NotificationRegistrar registrar_;
 
-  // Whether we are currently animating to close. This is used to ignore
-  // ExtensionView::PreferredSizeChanged notifications.
-  bool closing_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionInfoBarDelegate);
 };