Use StringPairs with SplitStringIntoKeyValuePairs in google_apis

google_apis/gaia/gaia_auth_fetcher.cc

 // Copyright (c) 2012 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 "google_apis/gaia/gaia_auth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 391 matching lines @@
 void GaiaAuthFetcher::ParseClientLoginResponse(const std::string& data,
                                                std::string* sid,
                                                std::string* lsid,
                                                std::string* token) {
   using std::vector;
   using std::pair;
   using std::string;
   sid->clear();
   lsid->clear();
   token->clear();
-  vector<pair<string, string> > tokens;
+  base::StringPairs tokens;
   base::SplitStringIntoKeyValuePairs(data, '=', '\n', &tokens);
-  for (vector<pair<string, string> >::iterator i = tokens.begin();
+  for (base::StringPairs::iterator i = tokens.begin();
       i != tokens.end(); ++i) {
     if (i->first == "SID") {
       sid->assign(i->second);
     } else if (i->first == "LSID") {
       lsid->assign(i->second);
     } else if (i->first == "Auth") {
       token->assign(i->second);
     }
   }
   // If this was a request for uberauth token, then that's all we've got in
@@ skipping 52 matching lines @@
 // static
 void GaiaAuthFetcher::ParseClientLoginFailure(const std::string& data,
                                               std::string* error,
                                               std::string* error_url,
                                               std::string* captcha_url,
                                               std::string* captcha_token) {
   using std::vector;
   using std::pair;
   using std::string;
 
-  vector<pair<string, string> > tokens;
+  base::StringPairs tokens;
   base::SplitStringIntoKeyValuePairs(data, '=', '\n', &tokens);
-  for (vector<pair<string, string> >::iterator i = tokens.begin();
+  for (base::StringPairs::iterator i = tokens.begin();
        i != tokens.end(); ++i) {
     if (i->first == kErrorParam) {
       error->assign(i->second);
     } else if (i->first == kErrorUrlParam) {
       error_url->assign(i->second);
     } else if (i->first == kCaptchaUrlParam) {
       captcha_url->assign(i->second);
     } else if (i->first == kCaptchaTokenParam) {
       captcha_token->assign(i->second);
     }
@@ skipping 606 matching lines @@
   return alleged_error.find(kSecondFactor) !=
       std::string::npos;
 }
 
 // static
 bool GaiaAuthFetcher::IsWebLoginRequiredSuccess(
     const std::string& alleged_error) {
   return alleged_error.find(kWebLoginRequired) !=
       std::string::npos;
 }