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

chrome/browser/signin/signin_manager.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 "chrome/browser/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/signin/about_signin_internals.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
 #include "chrome/browser/signin/local_auth.h"
+#include "chrome/browser/signin/profile_oauth2_token_service.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/signin/signin_internals_util.h"
 #include "chrome/browser/signin/signin_manager_cookie_helper.h"
 #include "chrome/browser/signin/signin_manager_delegate.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/signin/token_service.h"
-#include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ skipping 74 matching lines @@
 }
 
 bool SigninManager::HasSigninProcess() const {
   return signin_process_id_ != kInvalidProcessId;
 }
 
 SigninManager::~SigninManager() {
 }
 
 void SigninManager::InitTokenService() {
-  SigninManagerBase::InitTokenService();
-  TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   if (token_service && !GetAuthenticatedUsername().empty())
-    token_service->LoadTokensFromDB();
+    token_service->LoadCredentials();
 }
 
 std::string SigninManager::SigninTypeToString(
     SigninManager::SigninType type) {
   switch (type) {
     case SIGNIN_TYPE_NONE:
       return "No Signin";
     case SIGNIN_TYPE_WITH_CREDENTIALS:
       return "Signin with credentials";
     case SIGNIN_TYPE_WITH_OAUTH_CODE:
@@ skipping 190 matching lines @@
   clear_authenticated_username();
   profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
 
   // Erase (now) stale information from AboutSigninInternals.
   NotifyDiagnosticsObservers(USERNAME, "");
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
       content::Source<Profile>(profile_),
       content::Details<const GoogleServiceSignoutDetails>(&details));
-  TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
-  token_service->ResetCredentialsInMemory();
-  token_service->EraseTokensFromDB();
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
+  token_service->RevokeAllCredentials();
 }
 
 void SigninManager::Initialize(Profile* profile, PrefService* local_state) {
   SigninManagerBase::Initialize(profile, local_state);
 
   // local_state can be null during unit tests.
   if (local_state) {
     local_state_pref_registrar_.Init(local_state);
     local_state_pref_registrar_.Add(
         prefs::kGoogleServicesUsernamePattern,
@@ skipping 194 matching lines @@
   } else {
     // No oauth token or callback, so just complete our pending signin.
     CompletePendingSignin();
   }
 }
 
 void SigninManager::CompletePendingSignin() {
   DCHECK(!possibly_invalid_username_.empty());
   OnSignedIn(possibly_invalid_username_);
 
-  // If we have oauth2 tokens, tell token service about them so it does not
-  // need to fetch them again.  Its important that the authenticated name has
-  // already been set before sending the oauth2 token to the token service.
-  // Some token service listeners will query the authenticated name when they
-  // receive the token available notification.
-  if (!temp_oauth_login_tokens_.refresh_token.empty()) {
-    TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
-    DCHECK(!GetAuthenticatedUsername().empty());

[fgorski, 2013/11/13 20:36:48]

Do we no longer care about this DCHECK, or was it simply not necessary in the
first place?

[Roger Tawa OOO till Jul 10th, 2013/11/13 20:56:12]

No, good to have the check.  Put it back in.

-    token_service->UpdateCredentialsWithOAuth2(temp_oauth_login_tokens_);
-    temp_oauth_login_tokens_ = ClientOAuthResult();
-  }
+  DCHECK(!temp_oauth_login_tokens_.refresh_token.empty());
+  ProfileOAuth2TokenService* token_service =
+    ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
+  token_service->UpdateCredentials(GetAuthenticatedUsername(),
+                                   temp_oauth_login_tokens_.refresh_token);
+  temp_oauth_login_tokens_ = ClientOAuthResult();
 }
 
 void SigninManager::OnExternalSigninCompleted(const std::string& username) {
   OnSignedIn(username);
 }
 
 void SigninManager::OnSignedIn(const std::string& username) {
   SetAuthenticatedUsername(username);
   possibly_invalid_username_.clear();
   profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
@@ skipping 44 matching lines @@
   }
 }
 
 void SigninManager::ProhibitSignout(bool prohibit_signout) {
   prohibit_signout_ = prohibit_signout;
 }
 
 bool SigninManager::IsSignoutProhibited() const {
   return prohibit_signout_;
 }