Cleanup: roll AutofillCCInfoBarDelegate into AutofillSaveCardInfoBarDelegateMobile.

components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h

Index: components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h
diff --git a/components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h b/components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h
index 7610d0cb2c1959dea4c9a309cbac6b20519741e3..1f20fea761720d45e88cac24fbc0d241a8f04767 100644
--- a/components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h
+++ b/components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h
@@ -9,8 +9,9 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "components/autofill/core/browser/autofill_cc_infobar_delegate.h"
+#include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/legal_message_line.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
 
 namespace base {
 class DictionaryValue;
@@ -20,8 +21,9 @@ namespace autofill {
 
 class CreditCard;
 
-// An InfoBarDelegate for saving credit cards on mobile devices.
-class AutofillSaveCardInfoBarDelegateMobile : public AutofillCCInfoBarDelegate {
+// An InfoBarDelegate that enables the user to allow or deny storing credit
+// card information gathered from a form submission. Only used on mobile.
+class AutofillSaveCardInfoBarDelegateMobile : public ConfirmInfoBarDelegate {
  public:
   AutofillSaveCardInfoBarDelegateMobile(
       bool upload,
@@ -39,7 +41,34 @@ class AutofillSaveCardInfoBarDelegateMobile : public AutofillCCInfoBarDelegate {
   // Called when a link in the legal message text was clicked.
   void OnLegalMessageLinkClicked(GURL url);
 
+  // ConfirmInfoBarDelegate:
+  int GetIconId() const override;

[Evan Stade, 2016/03/08 21:41:49]

why are some of these public and some private

[Justin Donnelly, 2016/03/08 22:41:47]

They were public in the old class, but didn't need to be. I've made them
private.

[Evan Stade, 2016/03/08 22:52:42]

typically I like to make inherited things public (or retain the parent class's
visibility) because it's somewhat deceptive to mark something as private when
the callsite is actually not part of |this|

[Justin Donnelly, 2016/03/09 03:46:07]

I've had reviewers ask me to make overridden methods private for reasons I can't
quite recall now. I agree with your rationale, so I've gone ahead and made all
these public.

+  base::string16 GetMessageText() const override;
+  base::string16 GetLinkText() const override;
+
  private:
+  void LogUserAction(AutofillMetrics::InfoBarMetric user_action);
+
+  // ConfirmInfoBarDelegate:
+  Type GetInfoBarType() const override;
+  infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
+  gfx::VectorIconId GetVectorIconId() const override;
+  bool ShouldExpire(const NavigationDetails& details) const override;
+  void InfoBarDismissed() override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  bool Accept() override;
+  bool Cancel() override;
+  GURL GetLinkURL() const override;
+
+  // Whether the action is an upload or a local save.
+  bool upload_;
+
+  // The callback to save credit card if the user accepts the infobar.
+  base::Closure save_card_callback_;
+
+  // Did the user ever explicitly accept or dismiss this infobar?
+  bool had_user_interaction_;
+
   // The resource ID for the icon that identifies the issuer of the card.
   int issuer_icon_id_;