Convert UserPolicySigninService to use OAuth2TokenService

chrome/browser/policy/cloud/user_policy_signin_service_base.cc

 // Copyright 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/policy/cloud/user_policy_signin_service_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 111 matching lines @@
           base::Bind(
               &UserPolicySigninServiceBase::ShutdownUserCloudPolicyManager,
               weak_factory_.GetWeakPtr()));
     } else {
       DVLOG(1) << "Error fetching policy: " << client->status();
     }
   }
 }
 
 void UserPolicySigninServiceBase::Shutdown() {
+  PrepareForUserCloudPolicyManagerShutdown();
+}
+
+void UserPolicySigninServiceBase::PrepareForUserCloudPolicyManagerShutdown() {
   UserCloudPolicyManager* manager = GetManager();
   if (manager && manager->core()->client())
     manager->core()->client()->RemoveObserver(this);
   if (manager && manager->core()->service())
     manager->core()->service()->RemoveObserver(this);
 }
 
 // static
 bool UserPolicySigninServiceBase::ShouldForceLoadPolicy() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 81 matching lines @@
   manager->Connect(g_browser_process->local_state(), client.Pass());
   DCHECK(manager->core()->service());
 
   // Observe the client to detect errors fetching policy.
   manager->core()->client()->AddObserver(this);
   // Observe the service to determine when it's initialized.
   manager->core()->service()->AddObserver(this);
 }
 
 void UserPolicySigninServiceBase::ShutdownUserCloudPolicyManager() {
-  Shutdown();
+  PrepareForUserCloudPolicyManagerShutdown();
   UserCloudPolicyManager* manager = GetManager();
   if (manager)
     manager->DisconnectAndRemovePolicy();
 }
 
 UserCloudPolicyManager* UserPolicySigninServiceBase::GetManager() {
   return UserCloudPolicyManagerFactory::GetForProfile(profile_);
 }
 
 }  // namespace policy