[Autofill] Componentize AutofillCCInfoBarDelegate.

chrome/browser/ui/autofill/chrome_autofill_client.h

Index: chrome/browser/ui/autofill/chrome_autofill_client.h
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.h b/chrome/browser/ui/autofill/chrome_autofill_client.h
index d9809d49625017b77d9e15e6b02f13e55c832e87..28208d39ee54b797fb6844e145b0667674ee8706 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.h
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.h
@@ -15,16 +15,24 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
+class ConfirmInfoBarDelegate;
+
 namespace content {
 struct FrameNavigateParams;
 struct LoadCommittedDetails;
 class WebContents;
 }
 
+namespace infobars {
+class InfoBar;
+class InfoBarManager;
+}
+
 namespace autofill {
 
 class AutofillDialogController;
 class AutofillKeystoneBridgeWrapper;
+class AutofillManager;
 class AutofillPopupControllerImpl;
 class CreditCardScannerController;
 struct FormData;
@@ -48,7 +56,8 @@ class ChromeAutofillClient
   void HideRequestAutocompleteDialog() override;
   void ShowAutofillSettings() override;
   void ShowUnmaskPrompt() override;
-  void ConfirmSaveCreditCard(const base::Closure& save_card_callback) override;
+  void ConfirmSaveCreditCard(AutofillManager* autofill_manager,
+                             const base::Closure& save_card_callback) override;
   bool HasCreditCardScanFeature() override;
   void ScanCreditCard(const CreditCardScanCallback& callback) override;
   void ShowRequestAutocompleteDialog(const FormData& form,
@@ -73,6 +82,8 @@ class ChromeAutofillClient
   void DidFillOrPreviewField(const base::string16& autofilled_value,
                              const base::string16& profile_full_name) override;
   void OnFirstUserGestureObserved() override;
+  scoped_ptr<infobars::InfoBar> CreateInfoBar(
+      scoped_ptr<ConfirmInfoBarDelegate> delegate) override;
 
   // content::WebContentsObserver implementation.
   void WebContentsDestroyed() override;
@@ -91,6 +102,9 @@ class ChromeAutofillClient
   }
 
  private:
+  // Gets the InfoBarManager instance associated with the client.
+  infobars::InfoBarManager* GetInfoBarManager();
+
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   // Creates |bridge_wrapper_|, which is responsible for dealing with Keystone
   // notifications.