[Payments] Display the shipping option error alongside the address

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 5821f18c816a408ce73f6fe634e5f7db2193cd4d..1919500caa3693b38423712516320557d1776bd0 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.h
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.h
@@ -78,12 +78,24 @@ 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|.
-std::unique_ptr<views::View> GetShippingAddressLabel(
+// 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.
+std::unique_ptr<views::View> GetShippingAddressLabelWithMissingInfo(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
-    const PaymentOptionsProvider& options,
     const PaymentsProfileComparator& comp);
 
 // Extracts and formats descriptive text from the given |profile| to represent