Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

chrome/browser/policy/asynchronous_policy_loader.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/asynchronous_policy_loader.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/message_loop.h"
+#include "chrome/browser/policy/policy_bundle.h"
+#include "chrome/browser/policy/policy_map.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace policy {
 
 AsynchronousPolicyLoader::AsynchronousPolicyLoader(
     AsynchronousPolicyProvider::Delegate* delegate,
     int reload_interval_minutes)
     : delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       reload_interval_(base::TimeDelta::FromMinutes(reload_interval_minutes)),
       origin_loop_(MessageLoop::current()),
       stopped_(false) {}
 
-void AsynchronousPolicyLoader::Init(const base::Closure& callback) {
-  updates_callback_ = callback;
+void AsynchronousPolicyLoader::Init(const UpdateCallback& callback) {
+  update_callback_ = callback;
+
+  // Load initial policy synchronously at startup.
   scoped_ptr<PolicyMap> policy(delegate_->Load());
   if (policy.get())
-    policy_.Swap(policy.get());
+    UpdatePolicy(policy.Pass());
+
   // Initialization can happen early when the file thread is not yet available,
   // but the subclass of the loader must do some of their initialization on the
   // file thread. Posting to the file thread directly before it is initialized
   // will cause the task to be forgotten. Instead, post a task to the ui thread
   // to delay the remainder of initialization until threading is fully
   // initialized.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&AsynchronousPolicyLoader::InitAfterFileThreadAvailable,
                  this));
@@ skipping 49 matching lines @@
 
 void AsynchronousPolicyLoader::InitOnFileThread() {
 }
 
 void AsynchronousPolicyLoader::StopOnFileThread() {
   delegate_.reset();
   CancelReloadTask();
 }
 
 void AsynchronousPolicyLoader::PostUpdatePolicyTask(PolicyMap* new_policy) {
-  // TODO(joaodasilva): make the callback own |new_policy|.
+  scoped_ptr<PolicyMap> policy(new_policy);
   origin_loop_->PostTask(
       FROM_HERE,
-      base::Bind(&AsynchronousPolicyLoader::UpdatePolicy, this, new_policy));
+      base::Bind(&AsynchronousPolicyLoader::UpdatePolicy,
+                 this, base::Passed(&policy)));
 }
 
-void AsynchronousPolicyLoader::UpdatePolicy(PolicyMap* new_policy_raw) {
-  scoped_ptr<PolicyMap> new_policy(new_policy_raw);
-  policy_.Swap(new_policy_raw);
-  if (!stopped_)
-    updates_callback_.Run();
+void AsynchronousPolicyLoader::UpdatePolicy(scoped_ptr<PolicyMap> policy) {
+  if (!stopped_) {
+    // TODO(joaodasilva): make this load policy from other namespaces too.
+    scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
+    bundle->Get(POLICY_DOMAIN_CHROME, std::string()).Swap(policy.get());
+    update_callback_.Run(bundle.Pass());
+  }
 }
 
 void AsynchronousPolicyLoader::InitAfterFileThreadAvailable() {
   if (!stopped_) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&AsynchronousPolicyLoader::InitOnFileThread, this));
   }
 }
 
 }  // namespace policy