[Payments] Use PaymentInstrument/AutofillPaymentInstrument throughout.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_VIEWS_UTIL_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_VIEWS_UTIL_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 37 matching lines @@
 // true), a |title| label. |delegate| becomes the delegate for the back and
 // close buttons.
 // +---------------------------+
 // | <- | Title                |
 // +---------------------------+
 std::unique_ptr<views::View> CreateSheetHeaderView(
     bool show_back_arrow,
     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.
 enum class AddressStyleType { SUMMARY, DETAILED };
 
 // Extracts and formats descriptive text from the given |profile| to represent
 // the address in the context specified by |type|.
 std::unique_ptr<views::View> GetShippingAddressLabel(
     AddressStyleType type,
     const std::string& locale,
@@ skipping 22 matching lines @@
 base::string16 GetShippingOptionSectionString(
     payments::mojom::PaymentShippingType shipping_type);
 
 std::unique_ptr<views::View> CreateShippingOptionLabel(
     payments::mojom::PaymentShippingOption* shipping_option,
     const base::string16& formatted_amount);
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_VIEWS_UTIL_H_