Prompt for expiration date for local cards.

components/autofill/core/browser/payments/full_card_request.cc

Index: components/autofill/core/browser/payments/full_card_request.cc
diff --git a/components/autofill/core/browser/payments/full_card_request.cc b/components/autofill/core/browser/payments/full_card_request.cc
index 81b759bbe14dfe8dc6cb64cbf418a7d29df745bc..7c565e87442b1fa61f5583739e47ce8f8373826e 100644
--- a/components/autofill/core/browser/payments/full_card_request.cc
+++ b/components/autofill/core/browser/payments/full_card_request.cc
@@ -22,8 +22,10 @@ FullCardRequest::FullCardRequest(AutofillClient* autofill_client,
       payments_client_(payments_client),
       personal_data_manager_(personal_data_manager),
       delegate_(nullptr),
+      should_unmask_card_(false),
       weak_ptr_factory_(this) {
   DCHECK(autofill_client_);
+  DCHECK(payments_client_);
   DCHECK(personal_data_manager_);
 }
 
@@ -45,14 +47,16 @@ void FullCardRequest::GetFullCard(const CreditCard& card,
   delegate_ = delegate;
   request_.reset(new payments::PaymentsClient::UnmaskRequestDetails);
   request_->card = card;
-  bool is_masked = card.record_type() == CreditCard::MASKED_SERVER_CARD;
-  if (is_masked)
+  should_unmask_card_ = card.record_type() == CreditCard::MASKED_SERVER_CARD ||
+                        (card.record_type() == CreditCard::FULL_SERVER_CARD &&
+                         card.ShouldUpdateExpiration());
+  if (should_unmask_card_)
     payments_client_->Prepare();
 
   autofill_client_->ShowUnmaskPrompt(request_->card, reason,
                                      weak_ptr_factory_.GetWeakPtr());
 
-  if (is_masked) {
+  if (should_unmask_card_) {
     autofill_client_->LoadRiskData(
         base::Bind(&FullCardRequest::OnDidGetUnmaskRiskData,
                    weak_ptr_factory_.GetWeakPtr()));
@@ -64,20 +68,22 @@ bool FullCardRequest::IsGettingFullCard() const {
 }
 
 void FullCardRequest::OnUnmaskResponse(const UnmaskResponse& response) {
-  // TODO(rouslan): Update the expiration date of the card on disk.
-  // http://crbug.com/606008
   if (!response.exp_month.empty())
     request_->card.SetRawInfo(CREDIT_CARD_EXP_MONTH, response.exp_month);
 
   if (!response.exp_year.empty())
     request_->card.SetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, response.exp_year);
 
-  if (request_->card.record_type() != CreditCard::MASKED_SERVER_CARD) {
+  if (request_->card.record_type() == CreditCard::LOCAL_CARD &&

[sebsg, 2016/04/27 14:59:02]

Quick question for my understanding. In what circumstances do we unmask local
credit cards? I didn't know we did that sometimes. Thanks.

[please use gerrit instead, 2016/04/27 18:05:44]

PaymentRequest uses FullCardRequest to prompt the user for the CVC and
optionally the updated expiration date of the local card. There's no form
filling in PaymentRequest, so the user has to manually type in the CVC
somewhere. I am using AutofillClient::ShowUnmaskPrompt() for this purpose.
"ShowUnmaskPrompt()" should really be renamed into "GetCvcAndExpirationDate()",
because that's what it does, but not in this patch.

Android UI for PaymentRequest landed on trunk only a couple of days ago and is
behind a flag.

Note that the local card's CVC is not sent to the server for the actual
unmasking: line 82.

+      (!response.exp_month.empty() || !response.exp_year.empty())) {
+    personal_data_manager_->UpdateCreditCard(request_->card);
+  }
+
+  if (!should_unmask_card_) {
     if (delegate_)
       delegate_->OnFullCardDetails(request_->card, response.cvc);
-    delegate_ = nullptr;
+    Reset();
     autofill_client_->OnUnmaskVerificationResult(AutofillClient::SUCCESS);
-    request_.reset();
     return;
   }
 
@@ -92,9 +98,8 @@ void FullCardRequest::OnUnmaskPromptClosed() {
   if (delegate_)
     delegate_->OnFullCardError();
 
-  delegate_ = nullptr;
+  Reset();
   payments_client_->CancelRequest();
-  request_.reset();
 }
 
 void FullCardRequest::OnDidGetUnmaskRiskData(const std::string& risk_data) {
@@ -114,6 +119,7 @@ void FullCardRequest::OnDidGetRealPan(AutofillClient::PaymentsRpcResult result,
     DCHECK_EQ(AutofillClient::SUCCESS, result);
     request_->card.set_record_type(CreditCard::FULL_SERVER_CARD);
     request_->card.SetNumber(base::UTF8ToUTF16(real_pan));
+    request_->card.SetServerStatus(CreditCard::OK);
 
     if (request_->user_response.should_store_pan)
       personal_data_manager_->UpdateServerCreditCard(request_->card);
@@ -125,9 +131,14 @@ void FullCardRequest::OnDidGetRealPan(AutofillClient::PaymentsRpcResult result,
       delegate_->OnFullCardError();
   }
 
-  delegate_ = nullptr;
+  Reset();
   autofill_client_->OnUnmaskVerificationResult(result);
+}
+
+void FullCardRequest::Reset() {
+  delegate_ = nullptr;
   request_.reset();
+  should_unmask_card_ = false;
 }
 
 }  // namespace payments