Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/policy/cloud/user_policy_signin_service_factory.cc

Index: chrome/browser/policy/cloud/user_policy_signin_service_factory.cc
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc
index 29394fd148dad3838241f226e10931df2b3a2c0c..fbeafd193133f74b6663b9a6e84b7faf57438df6 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
@@ -16,10 +17,8 @@
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/policy/cloud/user_policy_signin_service_android.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #else
 #include "chrome/browser/policy/cloud/user_policy_signin_service.h"
-#include "chrome/browser/signin/token_service_factory.h"
 #endif
 
 namespace policy {
@@ -35,11 +34,7 @@ UserPolicySigninServiceFactory::UserPolicySigninServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "UserPolicySigninService",
         BrowserContextDependencyManager::GetInstance()) {
-#if defined(OS_ANDROID)
   DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
-#else
-  DependsOn(TokenServiceFactory::GetInstance());
-#endif
   DependsOn(SigninManagerFactory::GetInstance());
   DependsOn(UserCloudPolicyManagerFactory::GetInstance());
 }
@@ -66,15 +61,20 @@ void UserPolicySigninServiceFactory::SetDeviceManagementServiceForTesting(
 
 BrowserContextKeyedService*
 UserPolicySigninServiceFactory::BuildServiceInstanceFor(
-    content::BrowserContext* profile) const {
+    content::BrowserContext* context) const {
+  Profile* profile = static_cast<Profile*>(context);
   BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
   DeviceManagementService* device_management_service =
       g_device_management_service ? g_device_management_service
                                   : connector->device_management_service();
-  return new UserPolicySigninService(static_cast<Profile*>(profile),
-                                     g_browser_process->local_state(),
-                                     device_management_service);
+  // TODO(atwilson): Inject SigninManager here or remove the dependency
+  // entirely. http://crbug.com/276270.
+  return new UserPolicySigninService(
+      profile,
+      g_browser_process->local_state(),
+      device_management_service,
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile));
 }
 
 bool