Added ConfigurationPolicyProvider::RefreshPolicies.

chrome/browser/policy/asynchronous_policy_loader.cc

 // Copyright (c) 2011 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/message_loop.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 base::Closure& default_callback) {
+  default_callback_ = default_callback;
   policy_.reset(delegate_->Load());
   // 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));
 }
 
 void AsynchronousPolicyLoader::Stop() {
   if (!stopped_) {
     stopped_ = true;
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&AsynchronousPolicyLoader::StopOnFileThread, this));
   }
 }
 
 AsynchronousPolicyLoader::~AsynchronousPolicyLoader() {
 }
 
-void AsynchronousPolicyLoader::Reload(bool force) {
+void AsynchronousPolicyLoader::Reload(const base::Closure& callback,
+                                      bool force) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (delegate_.get()) {
-    PostUpdatePolicyTask(delegate_->Load());
+    PostUpdatePolicyTask(callback, delegate_->Load());
+  } else {
+    PostUpdatePolicyTask(callback, NULL);
   }
 }
 
 void AsynchronousPolicyLoader::CancelReloadTask() {
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 void AsynchronousPolicyLoader::ScheduleReloadTask(
+    const base::Closure& callback,
     const base::TimeDelta& delay) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   CancelReloadTask();
 
   BrowserThread::PostDelayedTask(
       BrowserThread::FILE, FROM_HERE,
-      base::Bind(&AsynchronousPolicyLoader::ReloadFromTask,
-                 weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&AsynchronousPolicyLoader::Reload,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 callback,
+                 false),
       delay.InMilliseconds());
 }
 
 void AsynchronousPolicyLoader::ScheduleFallbackReloadTask() {
   // As a safeguard in case that the load delegate failed to timely notice a
   // change in policy, schedule a reload task that'll make us recheck after a
   // reasonable interval.
-  ScheduleReloadTask(reload_interval_);
-}
-
-void AsynchronousPolicyLoader::ReloadFromTask() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  Reload(false);
+  ScheduleReloadTask(default_callback_, reload_interval_);
 }
 
 void AsynchronousPolicyLoader::InitOnFileThread() {
 }
 
 void AsynchronousPolicyLoader::StopOnFileThread() {
   delegate_.reset();
   CancelReloadTask();
 }
 
 void AsynchronousPolicyLoader::PostUpdatePolicyTask(
+    const base::Closure& callback,
     DictionaryValue* new_policy) {
   // TODO(joaodasilva): make the callback own |new_policy|.
   origin_loop_->PostTask(
       FROM_HERE,
-      base::Bind(&AsynchronousPolicyLoader::UpdatePolicy, this, new_policy));
+      base::Bind(&AsynchronousPolicyLoader::UpdatePolicy,
+                 this,
+                 callback,
+                 new_policy));
 }
 
-void AsynchronousPolicyLoader::UpdatePolicy(DictionaryValue* new_policy_raw) {
-  scoped_ptr<DictionaryValue> new_policy(new_policy_raw);
-  DCHECK(policy_.get());
-  policy_.swap(new_policy);
+void AsynchronousPolicyLoader::UpdatePolicy(const base::Closure& callback,
+                                            DictionaryValue* new_policy) {
+  policy_.reset(new_policy);
   if (!stopped_)
-    updates_callback_.Run();
+    callback.Run();
 }
 
 void AsynchronousPolicyLoader::InitAfterFileThreadAvailable() {
   if (!stopped_) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&AsynchronousPolicyLoader::InitOnFileThread, this));
   }
 }
 
 }  // namespace policy