[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

 // Copyright 2016 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 "chrome/browser/ui/views/payments/payment_sheet_view_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 604 matching lines @@
 
   return builder.CreateWithChevron(std::move(inline_summary), nullptr);
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateShippingSectionContent() {
   autofill::AutofillProfile* profile = state()->selected_shipping_profile();
   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
 // user's selected shipping address, and a chevron.
 // +----------------------------------------------+
 // | Shipping Address   Barack Obama              |
 // |                    1600 Pennsylvania Ave.  > |
 // |                    1800MYPOTUS               |
 // +----------------------------------------------+
 std::unique_ptr<views::Button> PaymentSheetViewController::CreateShippingRow() {
@@ skipping 281 matching lines @@
   data_source_label->SetDefaultStyle(default_style);
   data_source_label->AddStyleRange(
       gfx::Range(link_begin, link_begin + link_length),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
   data_source_label->SizeToFit(0);
   content_view->AddChildView(data_source_label.release());
   return content_view;
 }
 
 }  // namespace payments