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

components/payments/content/payment_request_state.h

Index: components/payments/content/payment_request_state.h
diff --git a/components/payments/content/payment_request_state.h b/components/payments/content/payment_request_state.h
index b66ab59d268e930b5e76cbeaeae466283f9a74ec..a62d2b84eaea08d7ec64b91eb3340ca1d5bd93e2 100644
--- a/components/payments/content/payment_request_state.h
+++ b/components/payments/content/payment_request_state.h
@@ -114,6 +114,11 @@ class PaymentRequestState : public PaymentResponseHelper::Delegate,
   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_;
   }
@@ -216,6 +221,7 @@ class PaymentRequestState : public PaymentResponseHelper::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_;