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

chrome/browser/policy/file_based_policy_loader.h

Index: chrome/browser/policy/file_based_policy_loader.h
diff --git a/chrome/browser/policy/file_based_policy_loader.h b/chrome/browser/policy/file_based_policy_loader.h
index 97c3198793728fb464b3da9616ab34374c22ac8b..d7dedcc91635478390e956810a33517963e97617 100644
--- a/chrome/browser/policy/file_based_policy_loader.h
+++ b/chrome/browser/policy/file_based_policy_loader.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,9 +6,9 @@
 #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 {
 
@@ -25,7 +25,7 @@ class FileBasedPolicyLoader : public AsynchronousPolicyLoader {
   virtual void Reload();
 
   void OnFilePathChanged(const FilePath& path);
-  void OnError();
+  void OnFilePathError(const FilePath& path);
 
  protected:
   // FileBasedPolicyLoader objects should only be deleted by