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

ios/web/payments/payment_request_unittest.cc

 // Copyright 2016 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/web/public/payments/payment_request.h"
 
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 190 matching lines @@
   PaymentRequest output_request;
   base::DictionaryValue request_dict;
 
   // Add the expected values to expected_request.
   expected_request.details.total.label = base::ASCIIToUTF16("TOTAL");
   expected_request.details.total.amount.currency = base::ASCIIToUTF16("GBP");
   expected_request.details.total.amount.value = base::ASCIIToUTF16("6.66");
   expected_request.details.error = base::ASCIIToUTF16("Error in details");
 
   payments::PaymentMethodData method_data;
-  std::vector<base::string16> supported_methods;
-  supported_methods.push_back(base::ASCIIToUTF16("Visa"));
+  std::vector<std::string> supported_methods;
+  supported_methods.push_back("Visa");
   method_data.supported_methods = supported_methods;
   expected_request.method_data.push_back(method_data);
 
   // Add the same values to the dictionary to be parsed.
   std::unique_ptr<base::DictionaryValue> details_dict(
       new base::DictionaryValue);
   std::unique_ptr<base::DictionaryValue> total_dict(new base::DictionaryValue);
   total_dict->SetString("label", "TOTAL");
   std::unique_ptr<base::DictionaryValue> amount_dict(new base::DictionaryValue);
   amount_dict->SetString("currency", "GBP");
@@ skipping 351 matching lines @@
   EXPECT_EQ(request1, request2);
 
   request1.shipping_option = base::ASCIIToUTF16("2-Day");
   EXPECT_NE(request1, request2);
   request2.shipping_option = base::ASCIIToUTF16("3-Day");
   EXPECT_NE(request1, request2);
   request2.shipping_option = base::ASCIIToUTF16("2-Day");
   EXPECT_EQ(request1, request2);
 
   payments::PaymentMethodData method_datum;
-  method_datum.data = base::ASCIIToUTF16("{merchantId: '123456'}");
+  method_datum.data = "{merchantId: '123456'}";
   std::vector<payments::PaymentMethodData> method_data1;
   method_data1.push_back(method_datum);
   request1.method_data = method_data1;
   EXPECT_NE(request1, request2);
   std::vector<payments::PaymentMethodData> method_data2;
   request2.method_data = method_data2;
   EXPECT_NE(request1, request2);
   request2.method_data = method_data1;
   EXPECT_EQ(request1, request2);
 
@@ skipping 38 matching lines @@
   card_response2.card_number = base::ASCIIToUTF16("8888");
   response1.details = card_response1;
   EXPECT_NE(response1, response2);
   response2.details = card_response2;
   EXPECT_NE(response1, response2);
   response2.details = card_response1;
   EXPECT_EQ(response1, response2);
 }
 
 }  // namespace web