This is the fourth CL of several that will eventually replace TokenService with

chrome/browser/chromeos/login/oauth2_login_verifier.cc

 // Copyright (c) 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 "chrome/browser/chromeos/login/oauth2_login_verifier.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 149 matching lines @@
       new GaiaAuthFetcher(this,
                           std::string(GaiaConstants::kChromeOSSource),
                           user_request_context_.get()));
   gaia_fetcher_->StartMergeSession(gaia_token_);
 }
 
 void OAuth2LoginVerifier::OnMergeSessionSuccess(const std::string& data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LOG(INFO) << "MergeSession successful.";
   delegate_->OnSessionMergeSuccess();
-  // Get GAIA credentials needed to kick off TokenService and friends.
+  // Get GAIA credentials needed to kick off OAuth2TokenService and friends.
   StartOAuthLoginForGaiaCredentials();
 }
 
 void OAuth2LoginVerifier::OnMergeSessionFailure(
     const GoogleServiceAuthError& error) {
   LOG(WARNING) << "Failed MergeSession request,"
              << " error: " << error.state();
   // If MergeSession from GAIA service token fails, retry the session restore
   // from OAuth2 refresh token. If that failed too, signal the delegate.
   RetryOnError(
@@ skipping 55 matching lines @@
              << operation_id;
   UMA_HISTOGRAM_ENUMERATION(
       base::StringPrintf("OAuth2Login.%sFailure", operation_id),
       error.state(),
       GoogleServiceAuthError::NUM_STATES);
 
   error_handler.Run(IsConnectionOrServiceError(error));
 }
 
 }  // namespace chromeos