Enable user policy handling through the new cloud policy stack.

chrome/browser/policy/cloud_policy_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/cloud_policy_service.h"
 
 #include "base/callback.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 CloudPolicyService::CloudPolicyService(scoped_ptr<CloudPolicyClient> client,
-                                       scoped_ptr<CloudPolicyStore> store)
+                                       CloudPolicyStore* store)
     : client_(client.Pass()),
-      store_(store.Pass()),
+      store_(store),
       refresh_state_(REFRESH_NONE) {
   client_->AddObserver(this);
   store_->AddObserver(this);
+
+  // Make sure we initialize |client_| from the policy data that might be
+  // already present in |store_|.
+  OnStoreLoaded(store_);
 }
 
 CloudPolicyService::~CloudPolicyService() {
   client_->RemoveObserver(this);
   store_->RemoveObserver(this);
 }
 
 std::string CloudPolicyService::ManagedBy() const {
   const em::PolicyData* policy = store_->policy();
   if (policy) {
@@ skipping 91 matching lines @@
   refresh_state_ = REFRESH_NONE;
 
   for (std::vector<base::Closure>::iterator callback(callbacks.begin());
        callback != callbacks.end();
        ++callback) {
     callback->Run();
   }
 }
 
 }  // namespace policy