[Payments] Use PaymentInstrument/AutofillPaymentInstrument throughout.

chrome/browser/ui/views/payments/payment_request_views_util.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 "chrome/browser/ui/views/payments/payment_request_views_util.h"
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 152 matching lines @@
 
   views::Label* title_label = new views::Label(title);
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_label->SetFontList(
       title_label->GetDefaultFontList().DeriveWithSizeDelta(2));
   layout->AddView(title_label);
 
   return container;
 }
 
-std::unique_ptr<views::ImageView> CreateCardIconView(
-    const std::string& card_type) {
+std::unique_ptr<views::ImageView> CreateInstrumentIconView(
+    int icon_resource_id,
+    const base::string16& tooltip_text) {
   std::unique_ptr<views::ImageView> card_icon_view =
       base::MakeUnique<views::ImageView>();
   card_icon_view->set_can_process_events_within_subtree(false);
-  card_icon_view->SetImage(
-      ResourceBundle::GetSharedInstance()
-          .GetImageNamed(autofill::data_util::GetPaymentRequestData(card_type)
-                             .icon_resource_id)
-          .AsImageSkia());
-  card_icon_view->SetTooltipText(
-      autofill::CreditCard::TypeForDisplay(card_type));
+  card_icon_view->SetImage(ResourceBundle::GetSharedInstance()
+                               .GetImageNamed(icon_resource_id)
+                               .AsImageSkia());
+  card_icon_view->SetTooltipText(tooltip_text);
   card_icon_view->SetBorder(views::CreateRoundedRectBorder(
       1, 3, card_icon_view->GetNativeTheme()->GetSystemColor(
                 ui::NativeTheme::kColorId_UnfocusedBorderColor)));
   return card_icon_view;
 }
 
 std::unique_ptr<views::View> GetShippingAddressLabel(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile) {
@@ skipping 96 matching lines @@
   if (shipping_option) {
     container->AddChildView(
         new views::Label(base::ASCIIToUTF16(shipping_option->label)));
     container->AddChildView(new views::Label(formatted_amount));
   }
 
   return container;
 }
 
 }  // namespace payments