Fix policy refresh.

chrome/browser/policy/file_based_policy_loader.cc

 // Copyright (c) 2010 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"
 
 namespace {
 
 // Amount of time we wait for the files on disk to settle before trying to load
 // them. This alleviates the problem of reading partially written files and
@@ skipping 40 matching lines @@
 
 void FileBasedPolicyLoader::Init() {
   AsynchronousPolicyLoader::Init();
 
   // Initialization can happen early when the file thread is not yet available,
   // but the watcher's initialization must be done on the file thread. Posting
   // to a to the file directly before the file thread 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::FILE, FROM_HERE,
+      BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this,
                         &FileBasedPolicyLoader::InitAfterFileThreadAvailable));
 }
 
 void FileBasedPolicyLoader::Stop() {
   AsynchronousPolicyLoader::Stop();
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this, &FileBasedPolicyLoader::StopOnFileThread));
 }
@@ skipping 36 matching lines @@
 
   PostUpdatePolicyTask(new_policy.release());
 
   ScheduleFallbackReloadTask();
 }
 
 void FileBasedPolicyLoader::InitAfterFileThreadAvailable() {
   if (provider()) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
-        NewRunnableMethod(this, &FileBasedPolicyLoader::InitWatcher));
-
-    ScheduleFallbackReloadTask();
+        NewRunnableMethod(this, &FileBasedPolicyLoader::InitOnFileThread));
   }
 }
 
-void FileBasedPolicyLoader::InitWatcher() {
+void FileBasedPolicyLoader::InitOnFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   watcher_.reset(new FilePathWatcher);
   if (!config_file_path().empty() &&
       !watcher_->Watch(config_file_path(),
                        new FileBasedPolicyWatcherDelegate(this))) {
     OnError();
   }
 
   // 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();
+
+  ScheduleFallbackReloadTask();
 }
 
 void FileBasedPolicyLoader::StopOnFileThread() {
   watcher_.reset();
   if (reload_task_) {
     reload_task_->Cancel();
     reload_task_ = NULL;
   }
 }
 
@@ skipping 51 matching lines @@
   base::TimeDelta age = now - last_modification_clock_;
   if (age < settle_interval_) {
     *delay = settle_interval_ - age;
     return false;
   }
 
   return true;
 }
 
 }  // namespace policy