Card unmasking without form filling

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 "components/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 915 matching lines @@
         form->fields[1], *card);
     autofill_manager_->FillOrPreviewCreditCardForm(
         AutofillDriver::FORM_DATA_ACTION_FILL, kDefaultPageID, *form,
         form->fields[2], *card);
     autofill_manager_->FillOrPreviewCreditCardForm(
         AutofillDriver::FORM_DATA_ACTION_FILL, kDefaultPageID, *form,
         form->fields[3], *card);
 #endif  // defined(OS_IOS)
   }
 
+  // Convenience method to cast the FullCardRequest into a CardUnmaskDelegate.
+  CardUnmaskDelegate* full_card_unmask_delegate() {
+    DCHECK(autofill_manager_->full_card_request_);
+    return (CardUnmaskDelegate*)autofill_manager_->full_card_request_.get();
+  }
+
  protected:
   base::MessageLoop message_loop_;
   MockAutofillClient autofill_client_;
   std::unique_ptr<MockAutofillDriver> autofill_driver_;
   std::unique_ptr<TestAutofillManager> autofill_manager_;
   std::unique_ptr<TestAutofillExternalDelegate> external_delegate_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_;
   TestPaymentsClient* payments_client_;
   TestAutofillDownloadManager* download_manager_;
   TestPersonalDataManager personal_data_;
@@ skipping 3195 matching lines @@
     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;
+  autofill_manager_->GetOrCreateFullCardRequest()->GetFullCard(
+      card, AutofillClient::UNMASK_FOR_AUTOFILL,
+      autofill_manager_->weak_ptr_factory_.GetWeakPtr());
+
+  CardUnmaskDelegate::UnmaskResponse response;
   response.should_store_pan = false;
   response.cvc = ASCIIToUTF16("123");
-  autofill_manager_->OnUnmaskResponse(response);
+  full_card_unmask_delegate()->OnUnmaskResponse(response);
+
   autofill_manager_->OnDidGetRealPan(AutofillClient::SUCCESS,
                                      "4012888888881881");
+
   autofill_manager_->OnFormSubmitted(form);
 }
 
 TEST_F(AutofillManagerTest, FillInUpdatedExpirationDate) {
   FormData form;
   CreditCard card;
   PrepareForRealPanResponse(&form, &card);
 
-  AutofillManager::UnmaskResponse response;
+  CardUnmaskDelegate::UnmaskResponse response;
   response.should_store_pan = false;
   response.cvc = ASCIIToUTF16("123");
   response.exp_month = ASCIIToUTF16("02");
   response.exp_year = ASCIIToUTF16("2018");
-  autofill_manager_->OnUnmaskResponse(response);
+  full_card_unmask_delegate()->OnUnmaskResponse(response);
+
   autofill_manager_->OnDidGetRealPan(AutofillClient::SUCCESS,
                                      "4012888888881881");
-
-  EXPECT_EQ(ASCIIToUTF16("02"),
-            autofill_manager_->unmask_request_.card.GetRawInfo(
-                CREDIT_CARD_EXP_MONTH));
-  EXPECT_EQ(ASCIIToUTF16("2018"),
-            autofill_manager_->unmask_request_.card.GetRawInfo(
-                CREDIT_CARD_EXP_4_DIGIT_YEAR));
 }
 
 TEST_F(AutofillManagerTest, UploadCreditCard) {
   autofill_manager_->set_credit_card_upload_enabled(true);
 
   // Create, fill and submit an address form in order to establish a recent
   // profile which can be selected for the upload request.
   FormData address_form;
   test::CreateTestAddressFormData(&address_form);
   FormsSeen(std::vector<FormData>(1, address_form));
@@ skipping 757 matching lines @@
   FormsSeen(mixed_forms);
 
   // Suggestions should always be displayed.
   for (const FormFieldData& field : mixed_form.fields) {
     GetAutofillSuggestions(mixed_form, field);
     EXPECT_TRUE(external_delegate_->on_suggestions_returned_seen());
   }
 }
 
 }  // namespace autofill