Fixed crash in CloudPolicyManager.

chrome/browser/policy/cloud/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/cloud/user_cloud_policy_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/policy/cloud/cloud_external_data_manager.h"
@@ skipping 48 matching lines @@
 void UserCloudPolicyManager::Connect(
     PrefService* local_state,
     scoped_refptr<net::URLRequestContextGetter> request_context,
     scoped_ptr<CloudPolicyClient> client) {
   core()->Connect(client.Pass());
   core()->StartRefreshScheduler();
   core()->TrackRefreshDelayPref(local_state,
                                 policy_prefs::kUserPolicyRefreshRate);
   if (external_data_manager_)
     external_data_manager_->Connect(request_context);
+
   CreateComponentCloudPolicyService(component_policy_cache_path_,
                                     request_context);
 }
 
 // static
 scoped_ptr<CloudPolicyClient>
 UserCloudPolicyManager::CreateCloudPolicyClient(
     DeviceManagementService* device_management_service) {
   return make_scoped_ptr(
       new CloudPolicyClient(std::string(), std::string(),
                             USER_AFFILIATION_NONE,
                             NULL, device_management_service)).Pass();
 }
 
 void UserCloudPolicyManager::DisconnectAndRemovePolicy() {
   if (external_data_manager_)
     external_data_manager_->Disconnect();
   core()->Disconnect();
+
+  // store_->Clear() will publish the updated, empty policy. The component
+  // policy service must be cleared before OnStoreLoaded() is issued, so that
+  // component policies are also empty at CheckAndPublishPolicy().
+  ClearAndDestroyComponentCloudPolicyService();
+
   // When the |store_| is cleared, it informs the |external_data_manager_| that
   // all external data references have been removed, causing the
   // |external_data_manager_| to clear its cache as well.
   store_->Clear();
 }
 
 bool UserCloudPolicyManager::IsClientRegistered() const {
   return client() && client()->is_registered();
 }
 
 }  // namespace policy