[Autofill cleanup] Convert ConfirmCreditCardFillAssist to use OnceClosure

I want to fix some incorrect function ordering in these files, but I
can't upload the CL because it moves a banned base::Closure.  Thus, this
CL fixes that problem first.

Change-Id: I45142929b28015f18d1d848be8cc9eca6ac2f614
Reviewed-on: https://chromium-review.googlesource.com/c/1351256Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: Tao Bai <michaelbai@chromium.org>
Reviewed-by: Fabio Tirelo <ftirelo@chromium.org>
Commit-Queue: Jared Saul <jsaul@google.com>
Cr-Commit-Position: refs/heads/master@{#611332}

android_webview/browser/aw_autofill_client.cc

@@ -327,7 +327,7 @@ void AwAutofillClient::ShowLocalCardMigrationResults(
 
 void AwAutofillClient::ConfirmCreditCardFillAssist(
     const autofill::CreditCard& card,
-    const base::Closure& callback) {
+    base::OnceClosure callback) {
   NOTIMPLEMENTED();
 }
 

android_webview/browser/aw_autofill_client.h

@@ -103,7 +103,7 @@ class AwAutofillClient : public autofill::AutofillClient,
       bool show_prompt,
       UserAcceptedUploadCallback callback) override;
   void ConfirmCreditCardFillAssist(const autofill::CreditCard& card,
-                                   const base::Closure& callback) override;
+                                   base::OnceClosure callback) override;
   void LoadRiskData(
       base::OnceCallback<void(const std::string&)> callback) override;
   bool HasCreditCardScanFeature() override;

chrome/browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc

@@ -41,9 +41,9 @@ AutofillCreditCardFillingInfoBarDelegateMobileTest::CreateDelegate() {
   std::unique_ptr<AutofillCreditCardFillingInfoBarDelegateMobile> delegate(
       new AutofillCreditCardFillingInfoBarDelegateMobile(
           credit_card,
-          base::Bind(&AutofillCreditCardFillingInfoBarDelegateMobileTest::
-                         AcceptInfoBarCallback,
-                     base::Unretained(this))));
+          base::BindOnce(&AutofillCreditCardFillingInfoBarDelegateMobileTest::
+                             AcceptInfoBarCallback,
+                         base::Unretained(this))));
   delegate->set_was_shown();
   return delegate;
 }

chrome/browser/ui/autofill/chrome_autofill_client.cc

@@ -367,11 +367,11 @@ void ChromeAutofillClient::ConfirmSaveCreditCardToCloud(
 
 void ChromeAutofillClient::ConfirmCreditCardFillAssist(
     const CreditCard& card,
-    const base::Closure& callback) {
+    base::OnceClosure callback) {
 #if defined(OS_ANDROID)
   auto infobar_delegate =
       std::make_unique<AutofillCreditCardFillingInfoBarDelegateMobile>(
-          card, callback);
+          card, std::move(callback));
   auto* raw_delegate = infobar_delegate.get();
   if (InfoBarService::FromWebContents(web_contents())
           ->AddInfoBar(std::make_unique<AutofillCreditCardFillingInfoBar>(

chrome/browser/ui/autofill/chrome_autofill_client.h

@@ -95,7 +95,7 @@ class ChromeAutofillClient
 #endif  // defined(OS_ANDROID)
 
   void ConfirmCreditCardFillAssist(const CreditCard& card,
-                                   const base::Closure& callback) override;
+                                   base::OnceClosure callback) override;
   void LoadRiskData(
       base::OnceCallback<void(const std::string&)> callback) override;
   bool HasCreditCardScanFeature() override;

components/autofill/core/browser/autofill_assistant.cc

@@ -51,8 +51,8 @@ bool AutofillAssistant::CanShowCreditCardAssist() {
 void AutofillAssistant::ShowAssistForCreditCard(const CreditCard& card) {
   DCHECK(credit_card_form_data_);
   autofill_manager_->client()->ConfirmCreditCardFillAssist(
-      card, base::Bind(&AutofillAssistant::OnUserDidAcceptCreditCardFill,
-                       weak_ptr_factory_.GetWeakPtr(), card));
+      card, base::BindOnce(&AutofillAssistant::OnUserDidAcceptCreditCardFill,
+                           weak_ptr_factory_.GetWeakPtr(), card));
 }
 
 void AutofillAssistant::OnUserDidAcceptCreditCardFill(const CreditCard& card) {

components/autofill/core/browser/autofill_client.h

@@ -235,7 +235,7 @@ class AutofillClient : public RiskDataLoader {
   // Will show an infobar to get user consent for Credit Card assistive filling.
   // Will run |callback| on success.
   virtual void ConfirmCreditCardFillAssist(const CreditCard& card,
-                                           const base::Closure& callback) = 0;
+                                           base::OnceClosure callback) = 0;
 
   // Returns true if both the platform and the device support scanning credit
   // cards. Should be called before ScanCreditCard().

components/autofill/core/browser/autofill_credit_card_filling_infobar_delegate_mobile.cc

@@ -17,9 +17,9 @@ namespace autofill {
 AutofillCreditCardFillingInfoBarDelegateMobile::
     AutofillCreditCardFillingInfoBarDelegateMobile(
         const CreditCard& card,
-        const base::Closure& card_filling_callback)
+        base::OnceClosure card_filling_callback)
     : ConfirmInfoBarDelegate(),
-      card_filling_callback_(card_filling_callback),
+      card_filling_callback_(std::move(card_filling_callback)),
       had_user_interaction_(false),
       was_shown_(false),
       issuer_icon_id_(CreditCard::IconResourceId(card.network())),
@@ -64,7 +64,7 @@ void AutofillCreditCardFillingInfoBarDelegateMobile::InfoBarDismissed() {
 }
 
 bool AutofillCreditCardFillingInfoBarDelegateMobile::Accept() {
-  card_filling_callback_.Run();
+  std::move(card_filling_callback_).Run();
   LogUserAction(AutofillMetrics::INFOBAR_ACCEPTED);
   return true;
 }

components/autofill/core/browser/autofill_credit_card_filling_infobar_delegate_mobile.h

@@ -24,7 +24,7 @@ class AutofillCreditCardFillingInfoBarDelegateMobile
  public:
   AutofillCreditCardFillingInfoBarDelegateMobile(
       const CreditCard& card,
-      const base::Closure& card_filling_callback);
+      base::OnceClosure card_filling_callback);
   ~AutofillCreditCardFillingInfoBarDelegateMobile() override;
 
   int issuer_icon_id() const { return issuer_icon_id_; }
@@ -48,7 +48,7 @@ class AutofillCreditCardFillingInfoBarDelegateMobile
 
   // The callback after having accepted the infobar; will initiate filling the
   // credit card information.
-  base::Closure card_filling_callback_;
+  base::OnceClosure card_filling_callback_;
 
   // Did the user ever explicitly accept or dismiss this infobar?
   bool had_user_interaction_;

components/autofill/core/browser/test_autofill_client.cc

@@ -145,8 +145,8 @@ void TestAutofillClient::ConfirmSaveCreditCardToCloud(
 
 void TestAutofillClient::ConfirmCreditCardFillAssist(
     const CreditCard& card,
-    const base::Closure& callback) {
-  callback.Run();
+    base::OnceClosure callback) {
+  std::move(callback).Run();
 }
 
 void TestAutofillClient::LoadRiskData(

components/autofill/core/browser/test_autofill_client.h

@@ -76,7 +76,7 @@ class TestAutofillClient : public AutofillClient {
       bool show_prompt,
       UserAcceptedUploadCallback callback) override;
   void ConfirmCreditCardFillAssist(const CreditCard& card,
-                                   const base::Closure& callback) override;
+                                   base::OnceClosure callback) override;
   void LoadRiskData(
       base::OnceCallback<void(const std::string&)> callback) override;
   bool HasCreditCardScanFeature() override;

ios/chrome/browser/ui/autofill/chrome_autofill_client_ios.h

@@ -83,7 +83,7 @@ class ChromeAutofillClientIOS : public AutofillClient {
       bool show_prompt,
       UserAcceptedUploadCallback callback) override;
   void ConfirmCreditCardFillAssist(const CreditCard& card,
-                                   const base::Closure& callback) override;
+                                   base::OnceClosure callback) override;
   void LoadRiskData(
       base::OnceCallback<void(const std::string&)> callback) override;
   bool HasCreditCardScanFeature() override;

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

@@ -251,10 +251,10 @@ void ChromeAutofillClientIOS::ConfirmSaveCreditCardToCloud(
 
 void ChromeAutofillClientIOS::ConfirmCreditCardFillAssist(
     const CreditCard& card,
-    const base::Closure& callback) {
+    base::OnceClosure callback) {
   auto infobar_delegate =
       std::make_unique<AutofillCreditCardFillingInfoBarDelegateMobile>(
-          card, callback);
+          card, std::move(callback));
   auto* raw_delegate = infobar_delegate.get();
   if (infobar_manager_->AddInfoBar(
           ::CreateConfirmInfoBar(std::move(infobar_delegate)))) {

ios/web_view/internal/autofill/web_view_autofill_client_ios.h

@@ -76,7 +76,7 @@ class WebViewAutofillClientIOS : public AutofillClient {
       bool show_prompt,
       UserAcceptedUploadCallback callback) override;
   void ConfirmCreditCardFillAssist(const CreditCard& card,
-                                   const base::Closure& callback) override;
+                                   base::OnceClosure callback) override;
   void LoadRiskData(
       base::OnceCallback<void(const std::string&)> callback) override;
   bool HasCreditCardScanFeature() override;

ios/web_view/internal/autofill/web_view_autofill_client_ios.mm

@@ -171,7 +171,7 @@ void WebViewAutofillClientIOS::ConfirmSaveCreditCardToCloud(
 
 void WebViewAutofillClientIOS::ConfirmCreditCardFillAssist(
     const CreditCard& card,
-    const base::Closure& callback) {}
+    base::OnceClosure callback) {}
 
 void WebViewAutofillClientIOS::LoadRiskData(
     base::OnceCallback<void(const std::string&)> callback) {