Readability review.

chrome/browser/policy/config_dir_policy_provider.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/config_dir_policy_provider.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/message_loop.h"
+#include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/common/json_value_serializer.h"
 
 namespace {
 
 // Amount of time we wait for the files in the policy directory to settle before
 // trying to load it. This alleviates the problem of reading partially written
 // files and allows to batch quasi-simultaneous changes.
 const int kSettleIntervalSeconds = 5;
 
 // The time interval for rechecking policy. This is our fallback in case the
@@ skipping 192 matching lines @@
 }
 
 void PolicyDirWatcher::InitWatcher(
     const scoped_refptr<PolicyDirLoader>& loader) {
   if (!ChromeThread::CurrentlyOn(ChromeThread::FILE)) {
     ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE,
         NewRunnableMethod(this, &PolicyDirWatcher::InitWatcher, loader));
     return;
   }
 
-  if (!Watch(loader->config_dir(), loader.get()))
+  if (!watcher_.Watch(loader->config_dir(), loader.get()))
     loader->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.
   loader->Reload();
 }
 
 // ConfigDirPolicyProvider implementation:
 
@@ skipping 23 matching lines @@
        i != mapping->end(); ++i) {
     const PolicyValueMapEntry& entry(*i);
     Value* value;
     if (policies->Get(entry.name, &value) && value->IsType(entry.value_type))
       store->Apply(entry.policy_type, value->DeepCopy());
   }
 
   // TODO(mnissler): Handle preference overrides once |ConfigurationPolicyStore|
   // supports it.
 }