Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/autofill/autofill_cc_infobar_delegate.cc

Index: trunk/src/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
===================================================================
--- trunk/src/chrome/browser/autofill/autofill_cc_infobar_delegate.cc	(revision 238400)
+++ trunk/src/chrome/browser/autofill/autofill_cc_infobar_delegate.cc	(working copy)
@@ -5,7 +5,6 @@
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 
 #include "base/logging.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
@@ -25,15 +24,16 @@
     InfoBarService* infobar_service,
     const AutofillMetrics* metric_logger,
     const base::Closure& save_card_callback) {
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new AutofillCCInfoBarDelegate(
-          metric_logger, save_card_callback))));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new AutofillCCInfoBarDelegate(
+          infobar_service, metric_logger, save_card_callback)));
 }
 
 AutofillCCInfoBarDelegate::AutofillCCInfoBarDelegate(
+    InfoBarService* infobar_service,
     const AutofillMetrics* metric_logger,
     const base::Closure& save_card_callback)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       metric_logger_(metric_logger),
       save_card_callback_(save_card_callback),
       had_user_interaction_(false) {