Add IssueAuthToken support to the TokenService.

chrome/browser/chromeos/login/google_authenticator.cc

 // Copyright (c) 2010 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/google_authenticator.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/sha2.h"
 #include "base/string_util.h"
 #include "base/third_party/nss/blapi.h"
 #include "base/third_party/nss/sha256.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/login/auth_response_handler.h"
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/net/gaia/gaia_authenticator2.h"
+#include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/notification_service.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/libjingle/source/talk/base/urlencode.h"
 
 using base::Time;
 using base::TimeDelta;
 using file_util::GetFileSize;
 using file_util::PathExists;
@@ skipping 25 matching lines @@
 void GoogleAuthenticator::CancelClientLogin() {
   if (gaia_authenticator_->HasPendingFetch()) {
     gaia_authenticator_->CancelRequest();
     OnLoginFailure("Login has timed out; please try again!");
   }
 }
 
 void GoogleAuthenticator::TryClientLogin() {
   gaia_authenticator_->StartClientLogin(username_,
                                         password_,
-                                        GaiaAuthenticator2::kContactsService,
+                                        GaiaConstants::kContactsService,
                                         login_token_,
                                         login_captcha_);
   ChromeThread::PostDelayedTask(
       ChromeThread::UI,
       FROM_HERE,
       NewRunnableMethod(this,
                         &GoogleAuthenticator::CancelClientLogin),
       kClientLoginTimeoutMs);
 }
 
@@ skipping 22 matching lines @@
     const std::string& login_captcha) {
   unlock_ = false;
 
   // TODO(cmasone): Figure out how to parallelize fetch, username/password
   // processing without impacting testability.
   username_.assign(Canonicalize(username));
   ascii_hash_.assign(HashPassword(password));
 
   gaia_authenticator_.reset(
       new GaiaAuthenticator2(this,
-                             GaiaAuthenticator2::kChromeOSSource,
+                             GaiaConstants::kChromeOSSource,
                              profile->GetRequestContext()));
   // Will be used for retries.
   PrepareClientLoginAttempt(password, login_token, login_captcha);
   TryClientLogin();
   return true;
 }
 
 bool GoogleAuthenticator::AuthenticateToUnlock(const std::string& username,
                                                const std::string& password) {
   username_.assign(Canonicalize(username));
@@ skipping 294 matching lines @@
   DCHECK_EQ(parts.size(), 2U) << "email_address should have only one @";
   RemoveChars(parts[0], ".", &parts[0]);
   if (parts[0].find('+') != std::string::npos)
     parts[0].erase(parts[0].find('+'));
   std::string new_email = StringToLowerASCII(JoinString(parts, at));
   LOG(INFO) << "Canonicalized " << email_address << " to " << new_email;
   return new_email;
 }
 
 }  // namespace chromeos