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

components/payments/content/payment_request_spec.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_SPEC_H_
 #define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_SPEC_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 82 matching lines @@
       const mojom::PaymentCurrencyAmountPtr& currency_amount);
 
   // Uses CurrencyFormatter to get the formatted currency code for
   // |currency_amount|'s currency.
   std::string GetFormattedCurrencyCode(
       const mojom::PaymentCurrencyAmountPtr& currency_amount);
 
   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_;
   }
 
   const mojom::PaymentDetails& details() const { return *details_.get(); }
 
   void StartWaitingForUpdateWith(UpdateReason reason);
 
   bool IsMixedCurrency() const;
 
@@ skipping 55 matching lines @@
   // The |observer_for_testing_| will fire after all the |observers_| have been
   // notified.
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestSpec);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_SPEC_H_