[Merge M60][Payments] Do not select an address if the merchant doesn't support it

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

Index: chrome/browser/ui/views/payments/payment_request_item_list.h
diff --git a/chrome/browser/ui/views/payments/payment_request_item_list.h b/chrome/browser/ui/views/payments/payment_request_item_list.h
index c5718ca6702d7ee35eda542a957dc9909ceef73f..8d8251235a12268f8b0018dfe0aab656d437b59e 100644
--- a/chrome/browser/ui/views/payments/payment_request_item_list.h
+++ b/chrome/browser/ui/views/payments/payment_request_item_list.h
@@ -40,16 +40,14 @@ class PaymentRequestItemList {
          bool show_edit_button);
     ~Item() override;
 
-    // Gets the view associated with this item. It's owned by this object so
-    // that it can listen to any changes to the underlying model and update the
-    // view.
-    views::View* GetItemView();
-
     bool selected() const { return selected_; }
     // Changes the selected state of this item to |selected|.
     // SelectedStateChanged is called if |notify| is true.
     void SetSelected(bool selected, bool notify);
 
+    // Creates and returns the view associated with this list item.
+    std::unique_ptr<views::View> CreateItemView();
+
     // Returns a pointer to the PaymentRequestItemList that owns this object.
     PaymentRequestItemList* list() { return list_; }
 
@@ -95,13 +93,9 @@ class PaymentRequestItemList {
     virtual void EditButtonPressed() = 0;
 
    private:
-    // Creates and returns the view associated with this list item.
-    std::unique_ptr<views::View> CreateItemView();
-
     // views::ButtonListener:
     void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-    std::unique_ptr<views::View> item_view_;
     PaymentRequestSpec* spec_;
     PaymentRequestState* state_;
     PaymentRequestItemList* list_;