[Payments] Display the shipping option error alongside the address

chrome/browser/ui/views/payments/shipping_option_view_controller_browsertest.cc

 // 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.
 
 #include <list>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace payments {
 
 class PaymentRequestShippingOptionViewControllerTest
     : public PaymentRequestBrowserTestBase {
  protected:
   PaymentRequestShippingOptionViewControllerTest()
       : PaymentRequestBrowserTestBase(
             "/payment_request_dynamic_shipping_test.html") {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestShippingOptionViewControllerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(PaymentRequestShippingOptionViewControllerTest,
-                       OrderSummaryReflectsShippingOption) {
+                       SelectingVariousShippingOptions) {
   // In MI state, shipping is $5.00.
   autofill::AutofillProfile michigan = autofill::test::GetFullProfile2();
   michigan.set_use_count(100U);
   AddAutofillProfile(michigan);
   // A Canadian address will have no shipping options.
   autofill::AutofillProfile canada = autofill::test::GetFullProfile();
   canada.SetRawInfo(autofill::ADDRESS_HOME_COUNTRY, base::ASCIIToUTF16("CA"));
   canada.set_use_count(50U);
   AddAutofillProfile(canada);
 
@@ skipping 33 matching lines @@
   ResetEventObserverForSequence(std::list<DialogEvent>{
       DialogEvent::BACK_NAVIGATION, DialogEvent::SPEC_DONE_UPDATING});
   ClickOnChildInListViewAndWait(
       /* child_index=*/1, /*total_num_children=*/2,
       DialogViewID::SHIPPING_ADDRESS_SHEET_LIST_VIEW);
 
   // There is no longer shipping option section, because no shipping options are
   // available for Canada.
   EXPECT_EQ(nullptr, dialog_view()->GetViewByID(static_cast<int>(
                          DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION)));
+
+  // There is now an appropriate error that is shown in the shipping address
+  // section of the Payment Sheet. The string is returned by the merchant.
+  EXPECT_EQ(base::ASCIIToUTF16("We do not ship to this address"),
+            GetProfileLabelValues(
+                DialogViewID::PAYMENT_SHEET_SHIPPING_ADDRESS_SECTION)
+                .back());
+
+  // Go to the address selector and see this error as well.
+  OpenShippingAddressSectionScreen();
+  EXPECT_EQ(base::ASCIIToUTF16("We do not ship to this address"),
+            GetLabelText(DialogViewID::SHIPPING_ADDRESS_OPTION_ERROR));
 }
 
 }  // namespace payments