[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

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 9efedc2351fcff4df03649bf783a532a181c27a4..093cf061b0304d71171731bf9846913a7c9c36ec 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.h
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.h
@@ -86,25 +86,16 @@ std::unique_ptr<views::View> CreateProductLogoFooterView();
 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,