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

components/payments/content/payment_request_spec.h

Index: components/payments/content/payment_request_spec.h
diff --git a/components/payments/content/payment_request_spec.h b/components/payments/content/payment_request_spec.h
index fc5d894fc34a68ef61b56621d83ea19328c6a08b..1835c75ef068772abe337f8b33a0d985a7aa6902 100644
--- a/components/payments/content/payment_request_spec.h
+++ b/components/payments/content/payment_request_spec.h
@@ -100,8 +100,9 @@ class PaymentRequestSpec : public PaymentOptionsProvider {
   mojom::PaymentShippingOption* selected_shipping_option() const {
     return selected_shipping_option_;
   }
-  // if |selected_shipping_option()| is nullptr, this may contain a non-empty
-  // error returned by the merchant.
+  // This may contain a non-empty error returned by the merchant. In this case
+  // PaymentRequestState::selected_shipping_option_error_profile() will contain
+  // the profile related to the error.
   const base::string16& selected_shipping_option_error() const {
     return selected_shipping_option_error_;
   }