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

chrome/browser/invalidation/invalidation_service_factory.cc

Index: chrome/browser/invalidation/invalidation_service_factory.cc
diff --git a/chrome/browser/invalidation/invalidation_service_factory.cc b/chrome/browser/invalidation/invalidation_service_factory.cc
index 741e6fb216b93b8049db569ec3528a55da1b0cf8..39cb90b85d3f5f65e486533b67eff1ecf1aafe91 100644
--- a/chrome/browser/invalidation/invalidation_service_factory.cc
+++ b/chrome/browser/invalidation/invalidation_service_factory.cc
@@ -16,12 +16,8 @@
 #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
@@ -91,13 +87,11 @@ BrowserContextKeyedService* InvalidationServiceFactory::BuildServiceInstanceFor(
 #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();