[Payments] Use PaymentInstrument/AutofillPaymentInstrument throughout.

chrome/browser/ui/views/payments/payment_method_view_controller.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 "chrome/browser/ui/views/payments/payment_method_view_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_row_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/autofill/core/browser/autofill_type.h"
-#include "components/autofill/core/browser/credit_card.h"
 #include "components/payments/content/payment_request_state.h"
+#include "components/payments/core/payment_instrument.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/vector_icons.h"
 
 namespace payments {
 
 namespace {
 
 constexpr int kFirstTagValue = static_cast<int>(
     payments::PaymentRequestCommonTags::PAYMENT_REQUEST_COMMON_TAG_MAX);
 
 enum class PaymentMethodViewControllerTags : int {
   // The tag for the button that triggers the "add card" flow. Starts at
   // |kFirstTagValue| not to conflict with tags common to all views.
   ADD_CREDIT_CARD_BUTTON = kFirstTagValue,
 };
 
 class PaymentMethodListItem : public payments::PaymentRequestItemList::Item {
  public:
-  // Does not take ownership of |card|, which  should not be null and should
-  // outlive this object. |list| is the PaymentRequestItemList object that will
-  // own this.
-  PaymentMethodListItem(autofill::CreditCard* card,
+  // Does not take ownership of |instrument|, which  should not be null and
+  // should outlive this object. |list| is the PaymentRequestItemList object
+  // that will own this.
+  PaymentMethodListItem(PaymentInstrument* instrument,
                         PaymentRequestSpec* spec,
                         PaymentRequestState* state,
                         PaymentRequestItemList* list,
                         bool selected)
       : payments::PaymentRequestItemList::Item(spec, state, list, selected),
-        card_(card) {}
+        instrument_(instrument) {}
   ~PaymentMethodListItem() override {}
 
  private:
   // payments::PaymentRequestItemList::Item:
   std::unique_ptr<views::View> CreateItemView() override {
     std::unique_ptr<PaymentRequestRowView> row =
         base::MakeUnique<PaymentRequestRowView>(this);
     views::GridLayout* layout = new views::GridLayout(row.get());
     layout->SetInsets(
         kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
@@ skipping 28 matching lines @@
         base::MakeUnique<views::View>();
     card_info_container->set_can_process_events_within_subtree(false);
 
     std::unique_ptr<views::BoxLayout> box_layout =
         base::MakeUnique<views::BoxLayout>(views::BoxLayout::kVertical, 0,
                                            kPaymentRequestRowVerticalInsets, 0);
     box_layout->set_cross_axis_alignment(
         views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
     card_info_container->SetLayoutManager(box_layout.release());
 
+    card_info_container->AddChildView(new views::Label(instrument_->label()));
     card_info_container->AddChildView(
-        new views::Label(card_->TypeAndLastFourDigits()));
-    card_info_container->AddChildView(new views::Label(
-        card_->GetInfo(autofill::AutofillType(autofill::CREDIT_CARD_NAME_FULL),
-                       g_browser_process->GetApplicationLocale())));
+        new views::Label(instrument_->sublabel()));
     // TODO(anthonyvd): Add the "card is incomplete" label once the
     // completedness logic is implemented.
     layout->AddView(card_info_container.release());
 
     checkmark_ = CreateCheckmark(selected());
     layout->AddView(checkmark_.get());
 
-    std::unique_ptr<views::ImageView> card_icon_view =
-        CreateCardIconView(card_->type());
+    std::unique_ptr<views::ImageView> card_icon_view = CreateInstrumentIconView(
+        instrument_->icon_resource_id(), instrument_->label());
     card_icon_view->SetImageSize(gfx::Size(32, 20));
     layout->AddView(card_icon_view.release());
 
     return std::move(row);
   }
 
   void SelectedStateChanged() override {
     // This could be called before CreateItemView, so before |checkmark_| is
     // instantiated.
     if (checkmark_)
       checkmark_->SetVisible(selected());
 
-    state()->SetSelectedCreditCard(card_);
+    state()->SetSelectedInstrument(instrument_);
   }
 
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     if (IsComplete()) {
       list()->SelectItem(this);
     } else {
       // TODO(anthonyvd): Display the editor, pre-populated with the data that
       // already exists in |card|.
     }
   }
 
   bool IsComplete() const {
     // TODO(anthonyvd): Hook this up to the card completedness logic when it's
     // implemented in PaymentRequest.
     return true;
   }
 
-  autofill::CreditCard* card_;
+  PaymentInstrument* instrument_;
   std::unique_ptr<views::ImageView> checkmark_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentMethodListItem);
 };
 
 }  // namespace
 
 PaymentMethodViewController::PaymentMethodViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
     : PaymentRequestSheetController(spec, state, dialog) {
-  const std::vector<autofill::CreditCard*>& available_cards =
-      state->credit_cards();
+  const std::vector<std::unique_ptr<PaymentInstrument>>& available_instruments =
+      state->available_instruments();
 
-  for (autofill::CreditCard* card : available_cards) {
+  for (const std::unique_ptr<PaymentInstrument>& instrument :
+       available_instruments) {
     std::unique_ptr<PaymentMethodListItem> item =
         base::MakeUnique<PaymentMethodListItem>(
-            card, spec, state, &payment_method_list_,
-            card == state->selected_credit_card());
+            instrument.get(), spec, state, &payment_method_list_,
+            instrument.get() == state->selected_instrument());
     payment_method_list_.AddItem(std::move(item));
   }
 }
 
 PaymentMethodViewController::~PaymentMethodViewController() {}
 
 std::unique_ptr<views::View> PaymentMethodViewController::CreateView() {
   std::unique_ptr<views::View> list_view =
       payment_method_list_.CreateListView();
   list_view->set_id(
@@ skipping 32 matching lines @@
         PaymentMethodViewControllerTags::ADD_CREDIT_CARD_BUTTON):
       dialog()->ShowCreditCardEditor();
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 }  // namespace payments