Added UserCloudPolicyManager::ShutdownAndRemovePolicy()

chrome/browser/policy/user_policy_signin_service.cc

 // Copyright (c) 2012 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/user_policy_signin_service.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_service.h"
 #include "chrome/browser/policy/user_cloud_policy_manager.h"
@@ skipping 89 matching lines @@
   if (!profile_->GetPrefs()->GetBoolean(prefs::kLoadCloudPolicyOnSignin))
     return;
 
   // Either startup or shutdown the UserCloudPolicyManager depending on whether
   // the user is signed in or not.
   if (!manager_)
     return;  // Can be null in unit tests.
 
   SigninManager* signin_manager = SigninManagerFactory::GetForProfile(profile_);
   if (signin_manager->GetAuthenticatedUsername().empty()) {
-    manager_->Shutdown();
+    manager_->ShutdownAndRemovePolicy();
   } else {
     if (!manager_->cloud_policy_service()) {
       // Make sure we've initialized the DeviceManagementService. It's OK to
       // call this multiple times so we do it every time we initialize the
       // UserCloudPolicyManager.
       g_browser_process->browser_policy_connector()->
           ScheduleServiceInitialization(
               kPolicyServiceInitializationDelayMilliseconds);
       // Initialize the UserCloudPolicyManager if it isn't already initialized.
       policy::DeviceManagementService* service = g_browser_process->
@@ skipping 47 matching lines @@
 
 void UserPolicySigninService::OnGetTokenSuccess(
     const std::string& access_token,
     const base::Time& expiration_time) {
   // Pass along the new access token to the CloudPolicyClient.
   manager_->RegisterClient(access_token);
   oauth2_access_token_fetcher_.reset();
 }
 
 }  // namespace policy