[Autofill] Componentize AutofillCCInfoBarDelegate.

chrome/browser/ui/autofill/chrome_autofill_client.cc

Index: chrome/browser/ui/autofill/chrome_autofill_client.cc
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc
index 41f2aaac04d8301b7b0c872a2656b25f2ec994c2..529dfad2a02cdd70dcf7c94fc627ab5d1c3eff41 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/url_constants.h"
+#include "components/autofill/content/browser/autofill_cc_infobar_delegate.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
@@ -105,12 +105,12 @@ void ChromeAutofillClient::ShowAutofillSettings() {
 }
 
 void ChromeAutofillClient::ConfirmSaveCreditCard(
+    const AutofillDriver& autofill_driver,
     const AutofillMetrics& metric_logger,
     const base::Closure& save_card_callback) {
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents_);
   AutofillCCInfoBarDelegate::Create(
-      infobar_service, &metric_logger, save_card_callback);
+      InfoBarService::FromWebContents(web_contents_), &autofill_driver,
+      &metric_logger, save_card_callback);
 }
 
 void ChromeAutofillClient::ShowRequestAutocompleteDialog(