[Payments] Use PaymentInstrument/AutofillPaymentInstrument throughout.

chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc

Index: chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc b/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc
index 647ac325f39a9c75031f50fbba41e40e4a01fdd2..525b426ed240f0d9cc43b2917d4f0eb25edde8a4 100644
--- a/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc
+++ b/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc
@@ -129,8 +129,10 @@ CreditCardEditorViewController::CreateHeaderView() {
     const std::string autofill_card_type =
         autofill::data_util::GetCardTypeForBasicCardPaymentType(
             supported_network);
-    std::unique_ptr<views::ImageView> card_icon_view =
-        CreateCardIconView(autofill_card_type);
+    std::unique_ptr<views::ImageView> card_icon_view = CreateInstrumentIconView(
+        autofill::data_util::GetPaymentRequestData(autofill_card_type)
+            .icon_resource_id,
+        base::UTF8ToUTF16(supported_network));
     card_icon_view->SetImageSize(kCardIconSize);
 
     icons_row->AddChildView(card_icon_view.release());