Added UserCloudPolicyManager::ShutdownAndRemovePolicy()

chrome/browser/policy/user_cloud_policy_manager.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_cloud_policy_manager.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 77 matching lines @@
     if (service_->client()->is_registered()) {
       service_->RefreshPolicy(
           base::Bind(&UserCloudPolicyManager::OnInitialPolicyFetchComplete,
                      base::Unretained(this)));
     }
   } else {
     CancelWaitForPolicyFetch();
   }
 }
 
-void UserCloudPolicyManager::Shutdown() {
-  refresh_scheduler_.reset();
-  if (service_.get())
-    service_->client()->RemoveObserver(this);
-  service_.reset();
-  prefs_ = NULL;
+void UserCloudPolicyManager::ShutdownAndRemovePolicy() {
+  Shutdown();
+  store_->Clear();
 }
 
 void UserCloudPolicyManager::CancelWaitForPolicyFetch() {
   wait_for_policy_fetch_ = false;
   CheckAndPublishPolicy();
 
   // Now that |wait_for_policy_fetch_| is guaranteed to be false, the scheduler
   // can be started.
   if (service_.get() && !refresh_scheduler_.get() && prefs_) {
     refresh_scheduler_.reset(
@@ skipping 75 matching lines @@
 
 void UserCloudPolicyManager::OnInitialPolicyFetchComplete() {
   CancelWaitForPolicyFetch();
 }
 
 void UserCloudPolicyManager::OnRefreshComplete() {
   wait_for_policy_refresh_ = false;
   CheckAndPublishPolicy();
 }
 
+void UserCloudPolicyManager::Shutdown() {
+  refresh_scheduler_.reset();
+  if (service_.get())
+    service_->client()->RemoveObserver(this);
+  service_.reset();
+  prefs_ = NULL;
+}
+
 }  // namespace policy