Index: chrome/browser/policy/user_cloud_policy_manager.cc |
diff --git a/chrome/browser/policy/user_cloud_policy_manager.cc b/chrome/browser/policy/user_cloud_policy_manager.cc |
index 84f4c67dae68dcfe0ffdf1f54ac724870c0bc8b0..5b70cb30b7b72f37889a45d01b3af6254f1bc944 100644 |
--- a/chrome/browser/policy/user_cloud_policy_manager.cc |
+++ b/chrome/browser/policy/user_cloud_policy_manager.cc |
@@ -95,12 +95,9 @@ void UserCloudPolicyManager::Initialize(PrefService* prefs, |
} |
} |
-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() { |
@@ -196,4 +193,12 @@ void UserCloudPolicyManager::OnRefreshComplete() { |
CheckAndPublishPolicy(); |
} |
+void UserCloudPolicyManager::Shutdown() { |
+ refresh_scheduler_.reset(); |
+ if (service_.get()) |
+ service_->client()->RemoveObserver(this); |
+ service_.reset(); |
+ prefs_ = NULL; |
+} |
+ |
} // namespace policy |