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

ios/chrome/browser/ui/autofill/autofill_client_ios.mm

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/autofill/autofill_client_ios.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
-#include "components/autofill/core/browser/autofill_cc_infobar_delegate.h"
+#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/autofill/core/browser/ui/card_unmask_prompt_view.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
+#include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "components/keyed_service/core/service_access_type.h"
 #include "components/password_manager/core/browser/password_generation_manager.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "ios/chrome/browser/autofill/personal_data_manager_factory.h"
 #include "ios/chrome/browser/web_data_service_factory.h"
 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 
 namespace autofill {
 
 AutofillClientIOS::AutofillClientIOS(
     ios::ChromeBrowserState* browser_state,
     infobars::InfoBarManager* infobar_manager,
     id<AutofillClientIOSBridge> bridge,
     password_manager::PasswordGenerationManager* password_generation_manager,
     scoped_ptr<IdentityProvider> identity_provider)
     : browser_state_(browser_state),
       infobar_manager_(infobar_manager),
       bridge_(bridge),
       password_generation_manager_(password_generation_manager),
-      identity_provider_(identity_provider.Pass()),
+      identity_provider_(std::move(identity_provider)),
       unmask_controller_(browser_state->GetPrefs(),
                          browser_state->IsOffTheRecord()) {}
 
 AutofillClientIOS::~AutofillClientIOS() {
   HideAutofillPopup();
 }
 
 PersonalDataManager* AutofillClientIOS::GetPersonalDataManager() {
   return PersonalDataManagerFactory::GetForBrowserState(
       browser_state_->GetOriginalChromeBrowserState());
@@ skipping 25 matching lines @@
   unmask_controller_.ShowPrompt(
       provider->CreateCardUnmaskPromptView(&unmask_controller_), card,
       delegate);
 }
 
 void AutofillClientIOS::OnUnmaskVerificationResult(PaymentsRpcResult result) {
   unmask_controller_.OnVerificationResult(result);
 }
 
 void AutofillClientIOS::ConfirmSaveCreditCardLocally(
+    const CreditCard& card,
     const base::Closure& callback) {
   // This method is invoked synchronously from
   // AutofillManager::OnFormSubmitted(); at the time of detecting that a form
   // was submitted, the WebContents is guaranteed to be live. Since the
   // InfoBarService is a WebContentsUserData, it must also be alive at this
   // time.
-  AutofillCCInfoBarDelegate::CreateForLocalSave(infobar_manager_, callback);
+  infobar_manager_->AddInfoBar(CreateSaveCardInfoBarMobile(
+      make_scoped_ptr(new AutofillSaveCardInfoBarDelegateMobile(
+          false, card, scoped_ptr<base::DictionaryValue>(nullptr), callback))));
 }
 
 void AutofillClientIOS::ConfirmSaveCreditCardToCloud(
-    const base::Closure& callback,
-    scoped_ptr<base::DictionaryValue> legal_message) {
-  AutofillCCInfoBarDelegate::CreateForUpload(infobar_manager_, callback);
+    const CreditCard& card,
+    scoped_ptr<base::DictionaryValue> legal_message,
+    const base::Closure& callback) {
+  infobar_manager_->AddInfoBar(CreateSaveCardInfoBarMobile(
+      make_scoped_ptr(new AutofillSaveCardInfoBarDelegateMobile(
+          true, card, std::move(legal_message), callback))));
 }
 
 void AutofillClientIOS::LoadRiskData(
     const base::Callback<void(const std::string&)>& callback) {
   callback.Run(ios::GetChromeBrowserProvider()->GetRiskData());
 }
 
 bool AutofillClientIOS::HasCreditCardScanFeature() {
   return false;
 }
@@ skipping 60 matching lines @@
   return form_origin.SchemeIsCryptographic();
 }
 
 void AutofillClientIOS::OnFirstUserGestureObserved() {
   // TODO(gcasto): [Merge 306796] http://crbug.com/439425 Verify if this method
   // needs a real implementation or not.
   NOTIMPLEMENTED();
 }
 
 }  // namespace autofill