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

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"
@@ skipping 74 matching lines @@
             shipping_option_labels[0]);
   EXPECT_EQ(base::ASCIIToUTF16("$5.00"), shipping_option_labels[1]);
 
   // Go to the shipping address screen and select the second address (Canada).
   OpenShippingAddressSectionScreen();
   ResetEventObserver(DialogEvent::SPEC_DONE_UPDATING);
   ClickOnChildInListViewAndWait(
       /* child_index=*/1, /*total_num_children=*/2,
       DialogViewID::SHIPPING_ADDRESS_SHEET_LIST_VIEW, false);
 
+  // Now no address is selected.
+  EXPECT_EQ(nullptr, request->state()->selected_shipping_profile());
+  EXPECT_EQ(request->state()->shipping_profiles().back(),
+            request->state()->selected_shipping_option_error_profile());
+
+  // The address selector has this error.
+  EXPECT_EQ(base::ASCIIToUTF16("We do not ship to this address"),
+            GetLabelText(DialogViewID::SHIPPING_ADDRESS_OPTION_ERROR));
+
   // There is no a 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)));
   EXPECT_EQ(nullptr,
             dialog_view()->GetViewByID(static_cast<int>(
                 DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION_BUTTON)));
 
-  // 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.
-  EXPECT_EQ(base::ASCIIToUTF16("We do not ship to this address"),
-            GetLabelText(DialogViewID::SHIPPING_ADDRESS_OPTION_ERROR));
 }
 
 }  // namespace payments