Use base::StringPairs where appropriate from /components

components/autofill/content/browser/wallet/wallet_client_unittest.cc

 // Copyright 2013 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 "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 784 matching lines @@
 
     net::HttpRequestHeaders request_headers;
     fetcher->GetExtraRequestHeaders(&request_headers);
     std::string auth_header_value;
     EXPECT_TRUE(request_headers.GetHeader(
         net::HttpRequestHeaders::kAuthorization,
         &auth_header_value));
     EXPECT_EQ("GoogleLogin auth=gdToken", auth_header_value);
 
     const std::string& upload_data = fetcher->upload_data();
-    std::vector<std::pair<std::string, std::string> > tokens;
+    base::StringPairs tokens;
     base::SplitStringIntoKeyValuePairs(upload_data, '=', '&', &tokens);
     EXPECT_EQ(tokens.size(), expected_parameter_number);
 
     size_t num_params = 0U;
-    for (size_t i = 0; i < tokens.size(); ++i) {
-      const std::string& key = tokens[i].first;
-      const std::string& value = tokens[i].second;
+    for (base::StringPairs::const_iterator iter = tokens.begin();
+         iter != tokens.end();
+         ++iter) {
+      const std::string& key = iter->first;
+      const std::string& value = iter->second;
 
       if (key == "request_content_type") {
         EXPECT_EQ("application/json", value);
         num_params++;
       }
 
       if (key == "request") {
         EXPECT_EQ(json_payload,
                   GetData(
                       net::UnescapeURLComponent(
@@ skipping 1037 matching lines @@
   delegate_.ExpectBaselineMetrics();
 
   wallet_client_->GetWalletItems(base::string16(), base::string16());
   EXPECT_TRUE(wallet_client_->HasRequestInProgress());
   wallet_client_->CancelRequest();
   EXPECT_FALSE(wallet_client_->HasRequestInProgress());
 }
 
 }  // namespace wallet
 }  // namespace autofill