Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/invalidation/invalidation_service_factory.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/invalidation/invalidation_service_factory.h"
 
 #include "base/prefs/pref_registry.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
 #include "chrome/browser/invalidation/invalidation_service.h"
 #include "chrome/browser/invalidation/invalidation_service_android.h"
 #include "chrome/browser/invalidation/invalidator_storage.h"
 #include "chrome/browser/invalidation/p2p_invalidation_service.h"
 #include "chrome/browser/invalidation/ticl_invalidation_service.h"
 #include "chrome/browser/profiles/profile.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_manager.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 "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 
-class TokenService;
-
 namespace invalidation {
 
 // static
 InvalidationService* InvalidationServiceFactory::GetForProfile(
     Profile* profile) {
   return static_cast<InvalidationService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
@@ skipping 49 matching lines @@
   if (build_fake_invalidators_) {
     return BuildFakeInvalidationService(context);
   }
 
 #if defined(OS_ANDROID)
   InvalidationServiceAndroid* service = new InvalidationServiceAndroid(profile);
   return service;
 #else
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
-  TokenService* token_service = TokenServiceFactory::GetForProfile(profile);
-  OAuth2TokenService* oauth2_token_service =
+  ProfileOAuth2TokenService* oauth2_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
 
   TiclInvalidationService* service = new TiclInvalidationService(
       signin_manager,
-      token_service,
       oauth2_token_service,
       profile);
   service->Init();
   return service;
 #endif
 }
 
 void InvalidationServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   InvalidatorStorage::RegisterProfilePrefs(registry);
 }
 
 }  // namespace invalidation