[Payments] Use PaymentInstrument/AutofillPaymentInstrument throughout.

chrome/browser/ui/views/payments/payment_request_views_util.h

Index: chrome/browser/ui/views/payments/payment_request_views_util.h
diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.h b/chrome/browser/ui/views/payments/payment_request_views_util.h
index 69aad15fc04d8af4815e0fc1e3314dc972c2fc1e..be1882b586cd38611944b29d3427d1457846b8c9 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.h
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.h
@@ -55,10 +55,12 @@ std::unique_ptr<views::View> CreateSheetHeaderView(
     const base::string16& title,
     views::VectorIconButtonDelegate* delegate);
 
-// Returns a card image view for the given |card_type|. Includes a rounded rect
-// border. Callers need to set the size of the resulting ImageView.
-std::unique_ptr<views::ImageView> CreateCardIconView(
-    const std::string& card_type);
+// Returns an instrument image view for the given |icon_resource_id|. Includes
+// a rounded rect border. Callers need to set the size of the resulting
+// ImageView. Callers should set a |tooltip_text|.
+std::unique_ptr<views::ImageView> CreateInstrumentIconView(
+    int icon_resource_id,
+    const base::string16& tooltip_text);
 
 // Represents formatting options for each of the different contexts in which an
 // Address label may be displayed.