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

components/payments/content/payment_request_state.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 "components/payments/content/payment_request_state.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 17 matching lines @@
     const std::string& app_locale,
     autofill::PersonalDataManager* personal_data_manager,
     PaymentRequestDelegate* payment_request_delegate)
     : is_ready_to_pay_(false),
       is_waiting_for_merchant_validation_(false),
       app_locale_(app_locale),
       spec_(spec),
       delegate_(delegate),
       personal_data_manager_(personal_data_manager),
       selected_shipping_profile_(nullptr),
+      selected_shipping_option_error_profile_(nullptr),
       selected_contact_profile_(nullptr),
       selected_instrument_(nullptr),
       payment_request_delegate_(payment_request_delegate),
       profile_comparator_(app_locale, *spec) {
   PopulateProfileCache();
   SetDefaultProfileSelections();
   spec_->AddObserver(this);
 }
 PaymentRequestState::~PaymentRequestState() {}
 
@@ skipping 10 matching lines @@
 }
 
 void PaymentRequestState::OnCouldNotNormalize(
     const autofill::AutofillProfile& profile) {
   // Since the phone number is formatted in either case, this profile should be
   // used.
   OnAddressNormalized(profile);
 }
 
 void PaymentRequestState::OnSpecUpdated() {
+  if (spec_->selected_shipping_option_error().empty()) {
+    selected_shipping_option_error_profile_ = nullptr;
+  } else {
+    selected_shipping_option_error_profile_ = selected_shipping_profile_;
+    selected_shipping_profile_ = nullptr;
+  }
   is_waiting_for_merchant_validation_ = false;
   UpdateIsReadyToPayAndNotifyObservers();
 }
 
 bool PaymentRequestState::CanMakePayment() const {
   for (const std::unique_ptr<PaymentInstrument>& instrument :
        available_instruments_) {
     if (instrument->IsValidForCanMakePayment()) {
       // AddAutofillPaymentInstrument() filters out available instruments based
       // on supported card networks.
@@ skipping 238 matching lines @@
   if (is_waiting_for_merchant_validation_)
     return false;
 
   if (!profile_comparator()->IsShippingComplete(selected_shipping_profile_))
     return false;
 
   return profile_comparator()->IsContactInfoComplete(selected_contact_profile_);
 }
 
 }  // namespace payments