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

components/payments/content/payment_request_state.h

 // 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.
 
 #ifndef COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 #define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 96 matching lines @@
 
   // Record the use of the data models that were used in the Payment Request.
   void RecordUseStats();
 
   // Gets the Autofill Profile representing the shipping address or contact
   // information currently selected for this PaymentRequest flow. Can return
   // null.
   autofill::AutofillProfile* selected_shipping_profile() const {
     return selected_shipping_profile_;
   }
+  // If |spec()->selected_shipping_option_error()| is not empty, this contains
+  // the profile for which the error is about.
+  autofill::AutofillProfile* selected_shipping_option_error_profile() const {
+    return selected_shipping_option_error_profile_;
+  }
   autofill::AutofillProfile* selected_contact_profile() const {
     return selected_contact_profile_;
   }
   // Returns the currently selected instrument for this PaymentRequest flow.
   // It's not guaranteed to be complete. Returns nullptr if there is no selected
   // instrument.
   PaymentInstrument* selected_instrument() const {
     return selected_instrument_;
   }
 
@@ skipping 82 matching lines @@
   bool is_waiting_for_merchant_validation_;
 
   const std::string app_locale_;
 
   // Not owned. Never null. Both outlive this object.
   PaymentRequestSpec* spec_;
   Delegate* delegate_;
   autofill::PersonalDataManager* personal_data_manager_;
 
   autofill::AutofillProfile* selected_shipping_profile_;
+  autofill::AutofillProfile* selected_shipping_option_error_profile_;
   autofill::AutofillProfile* selected_contact_profile_;
   PaymentInstrument* selected_instrument_;
 
   // Profiles may change due to (e.g.) sync events, so profiles are cached after
   // loading and owned here. They are populated once only, and ordered by
   // frecency.
   std::vector<std::unique_ptr<autofill::AutofillProfile>> profile_cache_;
   std::vector<autofill::AutofillProfile*> shipping_profiles_;
   std::vector<autofill::AutofillProfile*> contact_profiles_;
   // Credit cards are directly owned by the instruments in this list.
   std::vector<std::unique_ptr<PaymentInstrument>> available_instruments_;
 
   PaymentRequestDelegate* payment_request_delegate_;
 
   std::unique_ptr<PaymentResponseHelper> response_helper_;
 
   PaymentsProfileComparator profile_comparator_;
 
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestState);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_