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

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 68 matching lines @@
     const base::string16& tooltip_text,
     float opacity = 1.0f);
 
 std::unique_ptr<views::View> CreateProductLogoFooterView();
 
 // 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|. If |error| is specified,
-// this will display it as the last item in an error state. |disabled_state|
-// will make the various label lines look disabled.
-std::unique_ptr<views::View> GetShippingAddressLabelWithError(
-    AddressStyleType type,
-    const std::string& locale,
-    const autofill::AutofillProfile& profile,
-    const base::string16& error,
-    bool disabled_state);
-
-// Extracts and formats descriptive text from the given |profile| to represent
 // the address in the context specified by |type|. The missing information will
 // be computed using |comp| and displayed as the last line in an informative
-// manner.
+// manner. |enabled| indicates whether the various label lines look enabled or
+// disabled.
 std::unique_ptr<views::View> GetShippingAddressLabelWithMissingInfo(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
-    const PaymentsProfileComparator& comp);
+    const PaymentsProfileComparator& comp,
+    bool enabled = true);
 
 // Extracts and formats descriptive text from the given |profile| to represent
 // the contact info in the context specified by |type|. Includes/excludes name,
 // email, and phone fields according to the respective boolean fields.
 std::unique_ptr<views::View> GetContactInfoLabel(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
     const PaymentOptionsProvider& options,
     const PaymentsProfileComparator& comp);
@@ skipping 16 matching lines @@
 // Creates a 2 line label containing |shipping_option|'s label and amount. If
 // |emphasize_label| is true, the label part will be in medium weight.
 std::unique_ptr<views::View> CreateShippingOptionLabel(
     payments::mojom::PaymentShippingOption* shipping_option,
     const base::string16& formatted_amount,
     bool emphasize_label);
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_VIEWS_UTIL_H_