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

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

Index: chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
index 469736473f24e1c5274b4b32a78b4ad795b98dde..f0abe4cba34f79c05f9d7f5b1c375b8c9ede0c28 100644
--- a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
+++ b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
@@ -622,19 +622,9 @@ PaymentSheetViewController::CreateShippingSectionContent() {
   if (!profile)
     return base::MakeUnique<views::Label>(base::string16());
 
-  // If there is a shipping option error related to the selected address,
-  // display it (without disabling the row because the user should feel like
-  // they can click on it to correct the problem). Otherwise, display the
-  // address possibly with the missing information to make it complete.
-  if (!spec()->selected_shipping_option_error().empty()) {
-    return GetShippingAddressLabelWithError(
-        AddressStyleType::SUMMARY, state()->GetApplicationLocale(), *profile,
-        spec()->selected_shipping_option_error(), /*disabled_state=*/false);
-  } else {
-    return GetShippingAddressLabelWithMissingInfo(
-        AddressStyleType::SUMMARY, state()->GetApplicationLocale(), *profile,
-        *(state()->profile_comparator()));
-  }
+  return GetShippingAddressLabelWithMissingInfo(
+      AddressStyleType::SUMMARY, state()->GetApplicationLocale(), *profile,
+      *(state()->profile_comparator()));
 }
 
 // Creates the Shipping row, which contains a "Shipping address" label, the