[Payments] Display the shipping option error alongside the address

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

 // Copyright 2017 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_BROWSERTEST_BASE_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_BROWSERTEST_BASE_H_
 
 #include <list>
 #include <memory>
 #include <string>
@@ skipping 163 matching lines @@
   // Whether the editor textfield/combobox for the given |type| is currently in
   // an invalid state.
   bool IsEditorTextfieldInvalid(autofill::ServerFieldType type);
   bool IsEditorComboboxInvalid(autofill::ServerFieldType type);
 
   bool IsPayButtonEnabled();
 
   // Sets proper animation delegates and waits for animation to finish.
   void WaitForAnimation();
 
-  // Returns the text of the StyledLabel with the specific |view_id| that is a
-  // child of the Payment Request dialog view.
+  // Returns the text of the Label or StyledLabel with the specific |view_id|
+  // that is a child of the Payment Request dialog view.
+  const base::string16& GetLabelText(DialogViewID view_id);
   const base::string16& GetStyledLabelText(DialogViewID view_id);
   // Returns the error label text associated with a given field |type|.
   const base::string16& GetErrorLabelForType(autofill::ServerFieldType type);
 
   net::EmbeddedTestServer* https_server() { return https_server_.get(); }
 
   PaymentRequestDialogView* dialog_view() { return delegate_->dialog_view(); }
 
   void SetRegionDataLoader(autofill::RegionDataLoader* region_data_loader) {
     delegate_->SetRegionDataLoader(region_data_loader);
@@ skipping 67 matching lines @@
   TestChromePaymentRequestDelegate* delegate_;
   bool is_incognito_;
   bool is_valid_ssl_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestBrowserTestBase);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_BROWSERTEST_BASE_H_