Added ConfigurationPolicyProvider::RefreshPolicies.

chrome/browser/policy/file_based_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/file_based_policy_loader.h"
 
 #include "base/files/file_path_watcher.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 43 matching lines @@
   }
 
  private:
   scoped_refptr<FileBasedPolicyLoader> loader_;
   DISALLOW_COPY_AND_ASSIGN(FileBasedPolicyWatcherDelegate);
 };
 
 void FileBasedPolicyLoader::OnFilePathChanged(
     const FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  Reload(false);
+  Reload(default_callback(), false);
 }
 
 void FileBasedPolicyLoader::OnFilePathError(const FilePath& path) {
   LOG(ERROR) << "FilePathWatcher on " << path.value()
              << " failed.";
 }
 
-void FileBasedPolicyLoader::Reload(bool force) {
+void FileBasedPolicyLoader::Reload(const base::Closure& callback, bool force) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
-  if (!delegate())
+  if (!delegate()) {
+    PostUpdatePolicyTask(callback, NULL);
     return;
+  }
 
   // Check the directory time in order to see whether a reload is required.
   base::TimeDelta delay;
   base::Time now = base::Time::Now();
   if (!force && !IsSafeToReloadPolicy(now, &delay)) {
-    ScheduleReloadTask(delay);
+    ScheduleReloadTask(callback, delay);
     return;
   }
 
   // Load the policy definitions.
   scoped_ptr<DictionaryValue> new_policy(delegate()->Load());
 
   // Check again in case the directory has changed while reading it.
   if (!force && !IsSafeToReloadPolicy(now, &delay)) {
-    ScheduleReloadTask(delay);
+    ScheduleReloadTask(callback, delay);
     return;
   }
 
-  PostUpdatePolicyTask(new_policy.release());
+  PostUpdatePolicyTask(callback, new_policy.release());
 
   ScheduleFallbackReloadTask();
 }
 
 void FileBasedPolicyLoader::InitOnFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   watcher_.reset(new FilePathWatcher);
   const FilePath& path = config_file_path();
   if (!path.empty() &&
       !watcher_->Watch(path, new FileBasedPolicyWatcherDelegate(this))) {
     OnFilePathError(path);
   }
 
   // There might have been changes to the directory in the time between
   // construction of the loader and initialization of the watcher. Call reload
   // to detect if that is the case.
-  Reload(false);
+  Reload(default_callback(), false);
 
   ScheduleFallbackReloadTask();
 }
 
 void FileBasedPolicyLoader::StopOnFileThread() {
   watcher_.reset();
   AsynchronousPolicyLoader::StopOnFileThread();
 }
 
 bool FileBasedPolicyLoader::IsSafeToReloadPolicy(
@@ skipping 20 matching lines @@
   base::TimeDelta age = now - last_modification_clock_;
   if (age < settle_interval_) {
     *delay = settle_interval_ - age;
     return false;
   }
 
   return true;
 }
 
 }  // namespace policy