Make payment instrument labels dynamic

components/payments/core/autofill_payment_instrument.cc

 // Copyright 2017 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/payments/core/autofill_payment_instrument.h"
 
 #include <memory>
 
 #include "base/json/json_writer.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 12 matching lines @@
 namespace payments {
 
 AutofillPaymentInstrument::AutofillPaymentInstrument(
     const std::string& method_name,
     const autofill::CreditCard& card,
     const std::vector<autofill::AutofillProfile*>& billing_profiles,
     const std::string& app_locale,
     PaymentRequestDelegate* payment_request_delegate)
     : PaymentInstrument(
           method_name,
-          /* label= */ card.NetworkAndLastFourDigits(),
-          /* sublabel= */
-          card.GetInfo(autofill::AutofillType(autofill::CREDIT_CARD_NAME_FULL),
-                       app_locale),
           autofill::data_util::GetPaymentRequestData(card.network())
               .icon_resource_id,
           PaymentInstrument::Type::AUTOFILL),
       credit_card_(card),
       billing_profiles_(billing_profiles),
       app_locale_(app_locale),
       delegate_(nullptr),
       payment_request_delegate_(payment_request_delegate),
       weak_ptr_factory_(this) {}
 AutofillPaymentInstrument::~AutofillPaymentInstrument() {}
@@ skipping 55 matching lines @@
   return !(status & autofill::CREDIT_CARD_NO_CARDHOLDER ||
            status & autofill::CREDIT_CARD_NO_NUMBER);
 }
 
 void AutofillPaymentInstrument::RecordUse() {
   // Record the use of the credit card.
   payment_request_delegate_->GetPersonalDataManager()->RecordUseOf(
       credit_card_);
 }
 
+base::string16 AutofillPaymentInstrument::GetLabel() const {
+  return credit_card_.NetworkAndLastFourDigits();
+}
+
+base::string16 AutofillPaymentInstrument::GetSublabel() const {
+  return credit_card_.GetInfo(
+      autofill::AutofillType(autofill::CREDIT_CARD_NAME_FULL), app_locale_);
+}
+
 void AutofillPaymentInstrument::OnFullCardRequestSucceeded(
     const autofill::CreditCard& card,
     const base::string16& cvc) {
   DCHECK(delegate_);
   credit_card_ = card;
   cvc_ = cvc;
   is_waiting_for_card_unmask_ = false;
 
   if (!is_waiting_for_billing_address_normalization_)
     GenerateBasicCardResponse();
@@ skipping 35 matching lines @@
           .ToDictionaryValue();
   std::string stringified_details;
   base::JSONWriter::Write(*response_value, &stringified_details);
   delegate_->OnInstrumentDetailsReady(method_name(), stringified_details);
 
   delegate_ = nullptr;
   cvc_ = base::UTF8ToUTF16("");
 }
 
 }  // namespace payments