Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/startup/session_crashed_infobar_delegate.h

Index: trunk/src/chrome/browser/ui/startup/session_crashed_infobar_delegate.h
===================================================================
--- trunk/src/chrome/browser/ui/startup/session_crashed_infobar_delegate.h	(revision 238401)
+++ trunk/src/chrome/browser/ui/startup/session_crashed_infobar_delegate.h	(working copy)
@@ -5,20 +5,32 @@
 #ifndef CHROME_BROWSER_UI_STARTUP_SESSION_CRASHED_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_UI_STARTUP_SESSION_CRASHED_INFOBAR_DELEGATE_H_
 
+#include "base/gtest_prod_util.h"
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 
 class Browser;
 class Profile;
 
 // A delegate for the InfoBar shown when the previous session has crashed.
-class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate {
+class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate,
+                                      public content::NotificationObserver {
  public:
-  // If |browser| is not incognito, creates a session crashed infobar and
-  // delegate and adds the infobar to the InfoBarService for |browser|.
+  // If |browser| is not incognito, creates a session crashed infobar delegate
+  // and adds it to the InfoBarService for |browser|.
   static void Create(Browser* browser);
 
  private:
-  explicit SessionCrashedInfoBarDelegate(Profile* profile);
+  FRIEND_TEST_ALL_PREFIXES(SessionCrashedInfoBarDelegateUnitTest,
+                           DetachingTabWithCrashedInfoBar);
+#if defined(UNIT_TEST)
+  friend struct base::DefaultDeleter<SessionCrashedInfoBarDelegate>;
+#endif
+
+  SessionCrashedInfoBarDelegate(InfoBarService* infobar_service,
+                                Profile* profile);
   virtual ~SessionCrashedInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
@@ -28,7 +40,14 @@
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
+  // content::NotificationObserver:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
+  content::NotificationRegistrar registrar_;
   bool accepted_;
+  bool removed_notification_received_;
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionCrashedInfoBarDelegate);