Use base::StringPairs where appropriate from src/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 849 matching lines @@
   } else {
     consumer_->OnListAccountsFailure(GenerateAuthError(data, status));
   }
 }
 
 void GaiaAuthFetcher::OnGetUserInfoFetched(
     const std::string& data,
     const net::URLRequestStatus& status,
     int response_code) {
   if (status.is_success() && response_code == net::HTTP_OK) {
-    std::vector<std::pair<std::string, std::string> > tokens;
+    base::StringPairs tokens;
     UserInfoMap matches;
     base::SplitStringIntoKeyValuePairs(data, '=', '\n', &tokens);
-    std::vector<std::pair<std::string, std::string> >::iterator i;
+    base::StringPairs::iterator i;
     for (i = tokens.begin(); i != tokens.end(); ++i) {
       matches[i->first] = i->second;
     }
     consumer_->OnGetUserInfoSuccess(matches);
   } else {
     consumer_->OnGetUserInfoFailure(GenerateAuthError(data, status));
   }
 }
 
 void GaiaAuthFetcher::OnMergeSessionFetched(const std::string& data,
@@ skipping 90 matching lines @@
     NOTREACHED();
   }
 }
 
 // static
 bool GaiaAuthFetcher::IsSecondFactorSuccess(
     const std::string& alleged_error) {
   return alleged_error.find(kSecondFactor) !=
       std::string::npos;
 }