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

chrome/browser/policy/file_based_policy_loader.h

-// 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.
 
 #ifndef CHROME_BROWSER_POLICY_FILE_BASED_POLICY_LOADER_H_
 #define CHROME_BROWSER_POLICY_FILE_BASED_POLICY_LOADER_H_
 #pragma once
 
-#include "chrome/browser/file_path_watcher/file_path_watcher.h"
 #include "chrome/browser/policy/asynchronous_policy_loader.h"
 #include "chrome/browser/policy/file_based_policy_provider.h"
+#include "content/common/file_path_watcher/file_path_watcher.h"
 
 namespace policy {
 
 // A customized asynchronous policy loader that handles loading policy from a
 // file using a FilePathWatcher. The loader creates a fallback task to load
 // policy periodically in case the watcher fails and retries policy loads when
 // the watched file is in flux.
 class FileBasedPolicyLoader : public AsynchronousPolicyLoader {
  public:
   FileBasedPolicyLoader(
       FileBasedPolicyProvider::ProviderDelegate* provider_delegate);
 
   // AsynchronousPolicyLoader overrides:
   virtual void Reload();
 
   void OnFilePathChanged(const FilePath& path);
-  void OnError();
+  void OnFilePathError(const FilePath& path);
 
  protected:
   // FileBasedPolicyLoader objects should only be deleted by
   // RefCountedThreadSafe.
   friend class base::RefCountedThreadSafe<AsynchronousPolicyLoader>;
   virtual ~FileBasedPolicyLoader();
 
   const FilePath& config_file_path() { return config_file_path_; }
 
   // AsynchronousPolicyLoader overrides:
@@ skipping 30 matching lines @@
   // wall clock times come from the same source, just in case there is some
   // non-local filesystem involved.
   base::Time last_modification_clock_;
 
   DISALLOW_COPY_AND_ASSIGN(FileBasedPolicyLoader);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_FILE_BASED_POLICY_LOADER_H_