[Payments] Use PaymentInstrument/AutofillPaymentInstrument throughout.

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 <set>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "components/payments/content/payment_request.mojom.h"
 #include "components/payments/core/currency_formatter.h"
 
 namespace payments {
 
@@ skipping 24 matching lines @@
   void RemoveObserver(Observer* observer);
 
   bool request_shipping() const { return options_->request_shipping; }
   bool request_payer_name() const { return options_->request_payer_name; }
   bool request_payer_phone() const { return options_->request_payer_phone; }
   bool request_payer_email() const { return options_->request_payer_email; }
 
   const std::vector<std::string>& supported_card_networks() {
     return supported_card_networks_;
   }
+  const std::set<std::string>& supported_card_networks_set() {
+    return supported_card_networks_set_;
+  }
 
   // Uses CurrencyFormatter to format |amount| with the currency symbol for this
   // request's currency. Will use currency of the "total" display item, because
   // all items are supposed to have the same currency in a given request.
   base::string16 GetFormattedCurrencyAmount(const std::string& amount);
 
   // Uses CurrencyFormatter to get the formatted currency code for this
   // request's currency. Will use currency of the "total" display item, because
   // all items are supposed to have the same currency in a given request.
   std::string GetFormattedCurrencyCode();
@@ skipping 16 matching lines @@
   CurrencyFormatter* GetOrCreateCurrencyFormatter(
       const std::string& currency_code,
       const std::string& currency_system,
       const std::string& locale_name);
 
   mojom::PaymentOptionsPtr options_;
   mojom::PaymentDetailsPtr details_;
   const std::string app_locale_;
   std::unique_ptr<CurrencyFormatter> currency_formatter_;
 
-  // A list of supported basic card networks, in order that they were specified
-  // by the merchant.
+  // A list/set of supported basic card networks. The list is used to keep the
+  // order in which they were specified by the merchant. The set is used for
+  // fast lookup of supported methods.
   std::vector<std::string> supported_card_networks_;
+  std::set<std::string> supported_card_networks_set_;

[Mathieu, 2017/03/16 02:50:03]

this I'm not sure about. It's used in PaymentRequestState when creating the
initial list of instruments. If you have many credit cards, I think the O(1)
lookup will be nice, and it's relatively low overhead to create this set. But I
could see it both ways. WDYT?

[please use gerrit instead, 2017/03/16 14:27:02]

This is OK.

 
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestSpec);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_SPEC_H_