Revert 238283 "Infobar system refactor."

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

 // 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.
 
 #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"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 
 // static
 void AutofillCCInfoBarDelegate::Create(
     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) {
   metric_logger->LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN);
 }
 
 AutofillCCInfoBarDelegate::~AutofillCCInfoBarDelegate() {
   if (!had_user_interaction_)
     LogUserAction(AutofillMetrics::INFOBAR_IGNORED);
 }
@@ skipping 53 matching lines @@
 
 bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   web_contents()->OpenURL(content::OpenURLParams(
       GURL(autofill::kHelpURL), content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;
 }
 
 }  // namespace autofill