[Autofill] Componentize AutofillCCInfoBarDelegate.

components/autofill/content/browser/autofill_cc_infobar_delegate.h

Index: components/autofill/content/browser/autofill_cc_infobar_delegate.h
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.h b/components/autofill/content/browser/autofill_cc_infobar_delegate.h
similarity index 75%
rename from chrome/browser/autofill/autofill_cc_infobar_delegate.h
rename to components/autofill/content/browser/autofill_cc_infobar_delegate.h
index 2fd4e799708ed9a047d277f78b0d16221bca1729..827b8163eb53acd6c63cc28c6b95aec7f2d67307 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate.h
+++ b/components/autofill/content/browser/autofill_cc_infobar_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_CC_INFOBAR_DELEGATE_H_
-#define CHROME_BROWSER_AUTOFILL_AUTOFILL_CC_INFOBAR_DELEGATE_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_CC_INFOBAR_DELEGATE_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_CC_INFOBAR_DELEGATE_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -14,9 +14,13 @@
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "ui/base/window_open_disposition.h"
 
-class CreditCard;
-class PersonalDataManager;
-class InfoBarService;
+namespace infobars {
+class InfoBarManager;
+}
+
+namespace content {
+class WebContents;
+}
 
 namespace autofill {
 
@@ -26,21 +30,24 @@ class AutofillCCInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // Creates an autofill credit card infobar and delegate and adds the infobar
   // to |infobar_service|.
-  static void Create(InfoBarService* infobar_service,
+  static void Create(content::WebContents* web_contents,
+                     infobars::InfoBarManager* infobar_manager,
                      const AutofillMetrics* metric_logger,
                      const base::Closure& save_card_callback);
 
 #if defined(UNIT_TEST)
   static scoped_ptr<ConfirmInfoBarDelegate> Create(
+      content::WebContents* web_contents,
       const AutofillMetrics* metric_logger,
       const base::Closure& save_card_callback) {
-    return scoped_ptr<ConfirmInfoBarDelegate>(
-        new AutofillCCInfoBarDelegate(metric_logger, save_card_callback));
+    return scoped_ptr<ConfirmInfoBarDelegate>(new AutofillCCInfoBarDelegate(
+        web_contents, metric_logger, save_card_callback));
   }
 #endif
 
  private:
-  AutofillCCInfoBarDelegate(const AutofillMetrics* metric_logger,
+  AutofillCCInfoBarDelegate(content::WebContents* web_contents,
+                            const AutofillMetrics* metric_logger,
                             const base::Closure& save_card_callback);
   ~AutofillCCInfoBarDelegate() override;
 
@@ -58,6 +65,8 @@ class AutofillCCInfoBarDelegate : public ConfirmInfoBarDelegate {
   base::string16 GetLinkText() const override;
   bool LinkClicked(WindowOpenDisposition disposition) override;
 
+  content::WebContents* web_contents_;

[Ilya Sherman, 2014/11/19 21:22:46]

It's not clear to me that just caching the web_contents_, and assuming that's
safe, is appropriate.  I suspect that it would be more appropriate to first
componentize the InfoBarService class.

[droger, 2014/11/20 13:18:08]

InfoBarService is not meant to be componentized.
Using InfoBarManager is the right thing to do here.

[Pritam Nikam, 2014/11/21 08:26:25]

As suggested, abstracting the call to WebContents::OpenURL() throuh the
AutofillDriver, which has been passed through to the infobar delegate.

+
   // For logging UMA metrics.
   // Weak reference. Owned by the AutofillManager that initiated this infobar.
   const AutofillMetrics* metric_logger_;
@@ -75,4 +84,4 @@ class AutofillCCInfoBarDelegate : public ConfirmInfoBarDelegate {
 
 }  // namespace autofill
 
-#endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_CC_INFOBAR_DELEGATE_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_CC_INFOBAR_DELEGATE_H_