Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/infobars/simple_alert_infobar_delegate.cc

Index: trunk/src/chrome/browser/infobars/simple_alert_infobar_delegate.cc
===================================================================
--- trunk/src/chrome/browser/infobars/simple_alert_infobar_delegate.cc	(revision 238401)
+++ trunk/src/chrome/browser/infobars/simple_alert_infobar_delegate.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/infobars/simple_alert_infobar_delegate.h"
 
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ -13,16 +12,17 @@
                                         int icon_id,
                                         const string16& message,
                                         bool auto_expire) {
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new SimpleAlertInfoBarDelegate(icon_id, message, auto_expire))));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new SimpleAlertInfoBarDelegate(infobar_service, icon_id, message,
+                                     auto_expire)));
 }
 
 SimpleAlertInfoBarDelegate::SimpleAlertInfoBarDelegate(
+    InfoBarService* infobar_service,
     int icon_id,
     const string16& message,
     bool auto_expire)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       icon_id_(icon_id),
       message_(message),
       auto_expire_(auto_expire) {