[Merge M-53] Credit card editor for PaymentRequest UI.

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

 // Copyright 2016 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/payments/full_card_request.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 58 matching lines @@
 }
 
 void FullCardRequest::OnUnmaskResponse(const UnmaskResponse& response) {
   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::LOCAL_CARD &&
+      !request_->card.guid().empty() &&
       (!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);
     Reset();
     autofill_client_->OnUnmaskVerificationResult(AutofillClient::SUCCESS);
     return;
@@ skipping 68 matching lines @@
 void FullCardRequest::Reset() {
   weak_ptr_factory_.InvalidateWeakPtrs();
   payments_client_->CancelRequest();
   delegate_ = nullptr;
   request_.reset();
   should_unmask_card_ = false;
 }
 
 }  // namespace payments
 }  // namespace autofill