[Payments] Use PaymentInstrument/AutofillPaymentInstrument throughout.

components/payments/content/payment_request_state.h

 // 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.
 
 #ifndef COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 #define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "components/payments/content/payment_request.mojom.h"
 #include "components/payments/core/payment_instrument.h"
 
 namespace autofill {
 class AutofillProfile;
-class CreditCard;
 class PersonalDataManager;
 }  // namespace autofill
 
 namespace payments {
 
 class PaymentRequestSpec;
 
 // Keeps track of the information currently selected by the user and whether the
 // user is ready to pay. Uses information from the PaymentRequestSpec, which is
 // what the merchant has specified, as input into the "is ready to pay"
@@ skipping 43 matching lines @@
 
   // Gets the Autofill Profile representing the shipping address or contact
   // information currently selected for this PaymentRequest flow. Can return
   // null.
   autofill::AutofillProfile* selected_shipping_profile() const {
     return selected_shipping_profile_;
   }
   autofill::AutofillProfile* selected_contact_profile() const {
     return selected_contact_profile_;
   }
-  // Returns the currently selected credit card for this PaymentRequest flow.
+  // Returns the currently selected instrument for this PaymentRequest flow.
   // It's not guaranteed to be complete. Returns nullptr if there is no selected
-  // card.
-  autofill::CreditCard* selected_credit_card() const {
-    return selected_credit_card_;
+  // instrument.
+  PaymentInstrument* selected_instrument() const {
+    return selected_instrument_;
   }
   mojom::PaymentShippingOption* selected_shipping_option() {
     return selected_shipping_option_;
   }
 
   // Returns the appropriate Autofill Profiles for this user. The profiles
   // returned are owned by the PaymentRequestState.
   const std::vector<autofill::AutofillProfile*>& shipping_profiles() {
     return shipping_profiles_;
   }
   const std::vector<autofill::AutofillProfile*>& contact_profiles() {
     return contact_profiles_;
   }
-  const std::vector<autofill::CreditCard*>& credit_cards() {
-    return credit_cards_;
+  const std::vector<PaymentInstrument*>& available_instruments() {
+    return available_instruments_;
   }
 
   // Setters to change the selected information. Will have the side effect of
   // recomputing "is ready to pay" and notify observers.
   void SetSelectedShippingProfile(autofill::AutofillProfile* profile);
   void SetSelectedContactProfile(autofill::AutofillProfile* profile);
-  void SetSelectedCreditCard(autofill::CreditCard* card);
+  void SetSelectedInstrument(PaymentInstrument* instrument);
 
   bool is_ready_to_pay() { return is_ready_to_pay_; }
 
   const std::string& GetApplicationLocale();
   autofill::PersonalDataManager* GetPersonalDataManager();
 
  private:
   // Fetches the Autofill Profiles for this user from the PersonalDataManager,
   // and stores copies of them, owned by this PaymentRequestState, in
   // profile_cache_.
   void PopulateProfileCache();
 
-  // Sets the initial selections for credit card and profiles, and notifies
+  // Sets the initial selections for instruments and profiles, and notifies
   // observers.
   void SetDefaultProfileSelections();
 
   // Uses the user-selected information as well as the merchant spec to update
   // |is_ready_to_pay_| with the current state, by validating that all the
   // required information is available. Will notify observers.
   void UpdateIsReadyToPayAndNotifyObservers();
 
   // Notifies all observers that selected information has changed.
   void NotifyOnSelectedInformationChanged();
@@ skipping 14 matching lines @@
 
   const std::string app_locale_;
 
   // Not owned. Never null. Both outlive this object.
   PaymentRequestSpec* spec_;
   Delegate* delegate_;
   autofill::PersonalDataManager* personal_data_manager_;
 
   autofill::AutofillProfile* selected_shipping_profile_;
   autofill::AutofillProfile* selected_contact_profile_;
-  autofill::CreditCard* selected_credit_card_;
+  PaymentInstrument* selected_instrument_;
   // The shipping options (and thus this pointer) are owned by |spec_| which
   // outlives this object.
   mojom::PaymentShippingOption* selected_shipping_option_;
 
-  std::unique_ptr<PaymentInstrument> selected_payment_instrument_;
-
   // Profiles may change due to (e.g.) sync events, so profiles are cached after
   // loading and owned here. They are populated once only, and ordered by
   // frecency.
   std::vector<std::unique_ptr<autofill::AutofillProfile>> profile_cache_;
   std::vector<autofill::AutofillProfile*> shipping_profiles_;
   std::vector<autofill::AutofillProfile*> contact_profiles_;
-  std::vector<std::unique_ptr<autofill::CreditCard>> card_cache_;
-  std::vector<autofill::CreditCard*> credit_cards_;
+  std::vector<std::unique_ptr<PaymentInstrument>> instrument_cache_;
+  std::vector<PaymentInstrument*> available_instruments_;
 
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestState);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_