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

content/common/file_path_watcher/file_path_watcher_stub.cc

Index: content/common/file_path_watcher/file_path_watcher_stub.cc
diff --git a/chrome/browser/file_path_watcher/file_path_watcher_stub.cc b/content/common/file_path_watcher/file_path_watcher_stub.cc
similarity index 59%
rename from chrome/browser/file_path_watcher/file_path_watcher_stub.cc
rename to content/common/file_path_watcher/file_path_watcher_stub.cc
index 6387715b67a67581910f7a6423a8cd9d86ac9284..42b6ec68bcbb1a6e2f73e3b766b0ed545ab08279 100644
--- a/chrome/browser/file_path_watcher/file_path_watcher_stub.cc
+++ b/content/common/file_path_watcher/file_path_watcher_stub.cc
@@ -1,15 +1,17 @@
-// 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.
 
 // This file exists for Unix systems which don't have the inotify headers, and
 // thus cannot build file_watcher_inotify.cc
 
-#include "chrome/browser/file_path_watcher/file_path_watcher.h"
+#include "chrome/common/file_path_watcher/file_path_watcher.h"
 
 class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
  public:
-  virtual bool Watch(const FilePath& path, FileWatcher::Delegate* delegate) {
+  virtual bool Watch(const FilePath& path,
+                     FileWatcher::Delegate* delegate,
+                     base::MessageLoopProxy*) OVERRIDE {
     return false;
   }
 };