Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/policy/cloud/user_policy_signin_service_base.h

Index: chrome/browser/policy/cloud/user_policy_signin_service_base.h
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_base.h b/chrome/browser/policy/cloud/user_policy_signin_service_base.h
index fc000aa99eca090c8b55cbb2ac25bea26d1fd0a0..27d6351979d856b9078226e1eb158a55d696f7dc 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_base.h
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_base.h
@@ -20,6 +20,7 @@
 
 class PrefService;
 class Profile;
+class SigninManager;
 
 namespace policy {
 
@@ -56,7 +57,8 @@ class UserPolicySigninServiceBase : public BrowserContextKeyedService,
   UserPolicySigninServiceBase(
       Profile* profile,
       PrefService* local_state,
-      DeviceManagementService* device_management_service);
+      DeviceManagementService* device_management_service,
+      SigninManager* signin_manager);
   virtual ~UserPolicySigninServiceBase();
 
   // Initiates a policy fetch as part of user signin, using a CloudPolicyClient
@@ -116,6 +118,10 @@ class UserPolicySigninServiceBase : public BrowserContextKeyedService,
   virtual void InitializeUserCloudPolicyManager(
       scoped_ptr<CloudPolicyClient> client);
 
+  // Prepares for the UserCloudPolicyManager to be shutdown due to
+  // user signout or profile destruction.
+  virtual void PrepareForUserCloudPolicyManagerShutdown();
+
   // Shuts down the UserCloudPolicyManager (for example, after the user signs
   // out) and deletes any cached policy.
   virtual void ShutdownUserCloudPolicyManager();
@@ -125,6 +131,7 @@ class UserPolicySigninServiceBase : public BrowserContextKeyedService,
 
   Profile* profile() { return profile_; }
   content::NotificationRegistrar* registrar() { return &registrar_; }
+  SigninManager* signin_manager() { return signin_manager_; }
 
  private:
   // Weak pointer to the profile this service is associated with.
@@ -134,6 +141,7 @@ class UserPolicySigninServiceBase : public BrowserContextKeyedService,
 
   PrefService* local_state_;
   DeviceManagementService* device_management_service_;
+  SigninManager* signin_manager_;
 
   base::WeakPtrFactory<UserPolicySigninServiceBase> weak_factory_;