Add upstream bits necessary for iOS card unmask prompt.

components/autofill/core/browser/autofill_manager_unittest.cc

 // 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.
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 1495 matching lines @@
   FormFieldData* month_field = nullptr;
   for (size_t i = 0; i < form.fields.size(); ++i) {
     if (form.fields[i].name == ASCIIToUTF16("cardnumber"))
       number_field = &form.fields[i];
     else if (form.fields[i].name == ASCIIToUTF16("nameoncard"))
       name_field = &form.fields[i];
     else if (form.fields[i].name == ASCIIToUTF16("ccmonth"))
       month_field = &form.fields[i];
   }
 
-  // Empty form - whole form is Autofilled.
+  // Empty form - whole form is Autofilled (except on iOS).
   EXPECT_TRUE(WillFillCreditCardNumber(form, *number_field));
+#if defined(OS_IOS)
+  EXPECT_FALSE(WillFillCreditCardNumber(form, *name_field));
+#else
   EXPECT_TRUE(WillFillCreditCardNumber(form, *name_field));
+#endif  // defined(OS_IOS)
+
   // If the user has entered a value, it won't be overridden.
   number_field->value = ASCIIToUTF16("gibberish");
   EXPECT_TRUE(WillFillCreditCardNumber(form, *number_field));
   EXPECT_FALSE(WillFillCreditCardNumber(form, *name_field));
+
+  // But if that value is removed, it will be Autofilled (except on iOS).
   number_field->value.clear();
+#if defined(OS_IOS)
+  EXPECT_FALSE(WillFillCreditCardNumber(form, *name_field));
+#else
   EXPECT_TRUE(WillFillCreditCardNumber(form, *name_field));
+#endif  // defined(OS_IOS)
 
   // When part of the section is Autofilled, only fill the initiating field.
   month_field->is_autofilled = true;
   EXPECT_FALSE(WillFillCreditCardNumber(form, *name_field));
   EXPECT_TRUE(WillFillCreditCardNumber(form, *number_field));
 }
 
 // Test that we correctly fill an address form from an auxiliary profile.
 TEST_F(AutofillManagerTest, FillAddressFormFromAuxiliaryProfile) {
   personal_data_.ClearAutofillProfiles();
@@ skipping 1650 matching lines @@
   CreateTestCreditCardFormData(&form, true, false);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
   CreditCard card(CreditCard::MASKED_SERVER_CARD, "a123");
   test::SetCreditCardInfo(&card, "John Dillinger", "1881" /* Visa */, "01",
                           "2017");
   card.SetTypeForMaskedCard(kVisaCard);
 
   EXPECT_CALL(autofill_client_, ConfirmSaveCreditCard(_)).Times(0);
+#if defined(OS_IOS)
+  EXPECT_CALL(*autofill_driver_, SendFormDataToRenderer(_, _, _)).Times(4);
+#else
   EXPECT_CALL(*autofill_driver_, SendFormDataToRenderer(_, _, _));
+#endif  // defined(OS_IOS)
   autofill_manager_->FillOrPreviewCreditCardForm(
       AutofillDriver::FORM_DATA_ACTION_FILL, kDefaultPageID, form,
       form.fields[0], card, 0);
 
+#if defined(OS_IOS)
+  // Filling out the entire form on iOS requires requesting autofill on each of
+  // the form fields.
+  autofill_manager_->FillOrPreviewCreditCardForm(
+      AutofillDriver::FORM_DATA_ACTION_FILL, kDefaultPageID, form,
+      form.fields[1], card, 0);
+  autofill_manager_->FillOrPreviewCreditCardForm(
+      AutofillDriver::FORM_DATA_ACTION_FILL, kDefaultPageID, form,
+      form.fields[2], card, 0);
+  autofill_manager_->FillOrPreviewCreditCardForm(
+      AutofillDriver::FORM_DATA_ACTION_FILL, kDefaultPageID, form,
+      form.fields[3], card, 0);
+#endif  // defined(OS_IOS)
+
   // Manually fill out |form| so we can use it in OnFormSubmitted.
   for (size_t i = 0; i < form.fields.size(); ++i) {
     if (form.fields[i].name == ASCIIToUTF16("cardnumber"))
       form.fields[i].value = ASCIIToUTF16("4012888888881881");
     else if (form.fields[i].name == ASCIIToUTF16("nameoncard"))
       form.fields[i].value = ASCIIToUTF16("John H Dillinger");
     else if (form.fields[i].name == ASCIIToUTF16("ccmonth"))
       form.fields[i].value = ASCIIToUTF16("01");
     else if (form.fields[i].name == ASCIIToUTF16("ccyear"))
       form.fields[i].value = ASCIIToUTF16("2017");
   }
 
   AutofillManager::UnmaskResponse response;
   response.should_store_pan = false;
   response.cvc = ASCIIToUTF16("123");
   autofill_manager_->OnUnmaskResponse(response);
   autofill_manager_->OnDidGetRealPan(AutofillClient::SUCCESS,
                                      "4012888888881881");
   autofill_manager_->OnFormSubmitted(form);
 
   // The rest of this test is a regression test for http://crbug.com/483602.
   // The goal is not to crash.
   EXPECT_CALL(*autofill_driver_, SendFormDataToRenderer(_, _, _));
   for (size_t i = 0; i < form.fields.size(); ++i) {
     form.fields[i].value.clear();
   }
   autofill_manager_->FillOrPreviewCreditCardForm(
       AutofillDriver::FORM_DATA_ACTION_FILL, kDefaultPageID, form,
-      form.fields[0], card, 0);
+      form.fields[1], card, 0);
   autofill_manager_->OnUnmaskResponse(response);
   autofill_manager_->OnDidGetRealPan(AutofillClient::SUCCESS,
                                      "4012888888881881");
 
   form = FormData();
   test::CreateTestAddressFormData(&form);
   forms[0] = form;
   FormsSeen(forms);
   for (size_t i = 0; i < form.fields.size(); ++i) {
     if (form.fields[i].name == ASCIIToUTF16("firstname"))
       form.fields[i].value = ASCIIToUTF16("Flo");
     else if (form.fields[i].name == ASCIIToUTF16("lastname"))
       form.fields[i].value = ASCIIToUTF16("Master");
     else if (form.fields[i].name == ASCIIToUTF16("addr1"))
       form.fields[i].value = ASCIIToUTF16("123 Maple");
     else if (form.fields[i].name == ASCIIToUTF16("city"))
       form.fields[i].value = ASCIIToUTF16("Dallas");
     else if (form.fields[i].name == ASCIIToUTF16("state"))
       form.fields[i].value = ASCIIToUTF16("Texas");
     else if (form.fields[i].name == ASCIIToUTF16("zipcode"))
       form.fields[i].value = ASCIIToUTF16("77401");
     else if (form.fields[i].name == ASCIIToUTF16("country"))
       form.fields[i].value = ASCIIToUTF16("US");
   }
   autofill_manager_->OnFormSubmitted(form);
 }
 
 }  // namespace autofill