Add card details and legal message to Android save credit card infobar.

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 ca159ec0f37442f0cd4f97a2601ba3bc33dd2445..99180e223680b32983c9082d0bc330802df6dd97 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -53,6 +53,12 @@
 #include "components/ui/zoom/zoom_controller.h"
 #endif
 
+#if defined(OS_ANDROID) || defined(OS_IOS)
+#include "components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h"
+#include "components/autofill/core/browser/autofill_save_card_infobar_mobile.h"
+#include "components/infobars/core/infobar.h"
+#endif
+
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::ChromeAutofillClient);
 
 namespace autofill {
@@ -174,8 +180,15 @@ void ChromeAutofillClient::OnUnmaskVerificationResult(
 }
 
 void ChromeAutofillClient::ConfirmSaveCreditCardLocally(
+    const CreditCard& card,
     const base::Closure& callback) {
-#if !defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
+  InfoBarService::FromWebContents(web_contents())->AddInfoBar(
+      CreateSaveCardInfoBarMobile(
+          make_scoped_ptr(new AutofillSaveCardInfoBarDelegateMobile(
+              false, card, scoped_ptr<base::DictionaryValue>(nullptr),
+              callback))));
+#else
   if (IsSaveCardBubbleEnabled()) {
     // Do lazy initialization of SaveCardBubbleControllerImpl.
     autofill::SaveCardBubbleControllerImpl::CreateForWebContents(
@@ -185,25 +198,28 @@ void ChromeAutofillClient::ConfirmSaveCreditCardLocally(
     controller->ShowBubbleForLocalSave(callback);
     return;
   }
-#endif
+
   AutofillCCInfoBarDelegate::CreateForLocalSave(
       InfoBarService::FromWebContents(web_contents()), callback);
+#endif  // defined(OS_ANDROID) || defined(OS_IOS)
 }
 
 void ChromeAutofillClient::ConfirmSaveCreditCardToCloud(
-    const base::Closure& callback,
-    scoped_ptr<base::DictionaryValue> legal_message) {
-// TODO(jdonnelly): Implement save card prompt for OS_IOS.
-#if defined(OS_ANDROID)
-  AutofillCCInfoBarDelegate::CreateForUpload(
-      InfoBarService::FromWebContents(web_contents()), callback);
+    const CreditCard& card,
+    scoped_ptr<base::DictionaryValue> legal_message,
+    const base::Closure& callback) {
+#if defined(OS_ANDROID) || defined(OS_IOS)
+  InfoBarService::FromWebContents(web_contents())->AddInfoBar(
+      CreateSaveCardInfoBarMobile(
+          make_scoped_ptr(new AutofillSaveCardInfoBarDelegateMobile(
+              true, card, std::move(legal_message), callback))));
 #else
   // Do lazy initialization of SaveCardBubbleControllerImpl.
   autofill::SaveCardBubbleControllerImpl::CreateForWebContents(web_contents());
   autofill::SaveCardBubbleControllerImpl* controller =
       autofill::SaveCardBubbleControllerImpl::FromWebContents(web_contents());
   controller->ShowBubbleForUpload(callback, std::move(legal_message));
-#endif
+#endif  // defined(OS_ANDROID) || defined(OS_IOS)

[Evan Stade, 2016/01/13 04:09:19]

I never know what these comments mean, whether they're referring to the block
above or some block further up the macro conditional chain. As such I think
they're actively hurtful.

[please use gerrit instead, 2016/01/13 21:22:09]

Removed.

 }
 
 void ChromeAutofillClient::LoadRiskData(