Patch for bug 74983 (among others) to be applied to M11 696 branch.

chrome/browser/policy/file_based_policy_loader.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/compiler_specific.h"
+#include "content/browser/browser_thread.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
 // makes it possible to batch quasi-simultaneous changes.
 const int kSettleIntervalSeconds = 5;
 
 // The time interval for rechecking policy. This is our fallback in case the
 // delegate never reports a change to the ReloadObserver.
 const int kReloadIntervalMinutes = 15;
@@ skipping 13 matching lines @@
 FileBasedPolicyLoader::~FileBasedPolicyLoader() {}
 
 class FileBasedPolicyWatcherDelegate : public FilePathWatcher::Delegate {
  public:
   explicit FileBasedPolicyWatcherDelegate(
       scoped_refptr<FileBasedPolicyLoader> loader)
       : loader_(loader) {}
   virtual ~FileBasedPolicyWatcherDelegate() {}
 
   // FilePathWatcher::Delegate implementation:
-  void OnFilePathChanged(const FilePath& path) {
+  virtual void OnFilePathChanged(const FilePath& path) OVERRIDE {
     loader_->OnFilePathChanged(path);
   }
 
-  void OnError() {
-    loader_->OnError();
+  virtual void OnFilePathError(const FilePath& path) OVERRIDE {
+    loader_->OnFilePathError(path);
   }
 
  private:
   scoped_refptr<FileBasedPolicyLoader> loader_;
   DISALLOW_COPY_AND_ASSIGN(FileBasedPolicyWatcherDelegate);
 };
 
 void FileBasedPolicyLoader::OnFilePathChanged(
     const FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   Reload();
 }
 
-void FileBasedPolicyLoader::OnError() {
-  LOG(ERROR) << "FilePathWatcher on " << config_file_path().value()
+void FileBasedPolicyLoader::OnFilePathError(const FilePath& path) {
+  LOG(ERROR) << "FilePathWatcher on " << path.value()
              << " failed.";
 }
 
 void FileBasedPolicyLoader::Reload() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!delegate())
     return;
 
   // Check the directory time in order to see whether a reload is required.
@@ skipping 14 matching lines @@
   }
 
   PostUpdatePolicyTask(new_policy.release());
 
   ScheduleFallbackReloadTask();
 }
 
 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();
+  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();
 
   ScheduleFallbackReloadTask();
 }
 
@@ skipping 26 matching lines @@
   base::TimeDelta age = now - last_modification_clock_;
   if (age < settle_interval_) {
     *delay = settle_interval_ - age;
     return false;
   }
 
   return true;
 }
 
 }  // namespace policy