[Payments] base::string16 -> std::string in PaymentMethodData

ios/chrome/browser/payments/payment_request.mm

 // 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.
 
 #include "ios/chrome/browser/payments/payment_request.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ skipping 59 matching lines @@
   // contact profiles.
 
   if (!shipping_profiles_.empty())
     selected_shipping_profile_ = shipping_profiles_[0];
   if (!contact_profiles_.empty())
     selected_contact_profile_ = contact_profiles_[0];
 }
 
 void PaymentRequest::PopulateCreditCardCache() {
   for (const auto& method_data : web_payment_request_.method_data) {
-    for (const auto& supported_method : method_data.supported_methods) {
+    for (const std::string& supported_method : method_data.supported_methods) {
       // Reject non-ASCII supported methods.
-      if (base::IsStringASCII(supported_method)) {
-        supported_card_networks_.push_back(
-            base::UTF16ToASCII(supported_method));
-      }
+      if (base::IsStringASCII(supported_method))

[Moe, 2017/04/05 13:54:08]

should we have this check in payment_method_data.cc instead?

[Mathieu, 2017/04/05 13:59:18]

Yes sounds like a good idea! Also made the change to supported_networks and
types

+        supported_card_networks_.push_back(supported_method);
     }
   }
 
   const std::vector<autofill::CreditCard*>& credit_cards_to_suggest =
       personal_data_manager_->GetCreditCardsToSuggest();
   credit_card_cache_.reserve(credit_cards_to_suggest.size());
 
   // TODO(crbug.com/602666): Update the following logic to allow basic card
   // payment. https://w3c.github.io/webpayments-methods-card/
   // new PaymentRequest([{supportedMethods: ['basic-card'],
@@ skipping 28 matching lines @@
 
   selected_shipping_option_ = nullptr;
   for (auto* shipping_option : shipping_options_) {
     if (shipping_option->selected) {
       // If more than one option has |selected| set, the last one in the
       // sequence should be treated as the selected item.
       selected_shipping_option_ = shipping_option;
     }
   }
 }