Move FilePathWatcher to base/files.

base/files/file_path_watcher_win.cc

Index: base/files/file_path_watcher_win.cc
diff --git a/content/common/file_path_watcher/file_path_watcher_win.cc b/base/files/file_path_watcher_win.cc
similarity index 98%
rename from content/common/file_path_watcher/file_path_watcher_win.cc
rename to base/files/file_path_watcher_win.cc
index bf24e18ce3e47d0e3c8a837142f26168295ac4e8..eedcf22e72b70513195f6caa4e47031fc35f462b 100644
--- a/content/common/file_path_watcher/file_path_watcher_win.cc
+++ b/base/files/file_path_watcher_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/file_path_watcher/file_path_watcher.h"
+#include "base/files/file_path_watcher.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -12,6 +12,9 @@
 #include "base/time.h"
 #include "base/win/object_watcher.h"
 
+namespace base {
+namespace files {
+
 namespace {
 
 class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
@@ -202,6 +205,7 @@ bool FilePathWatcherImpl::SetupWatchHandle(const FilePath& dir,
       error_code != ERROR_ACCESS_DENIED &&
       error_code != ERROR_SHARING_VIOLATION &&
       error_code != ERROR_DIRECTORY) {
+    using ::operator<<; // Pick the right operator<< below.
     PLOG(ERROR) << "FindFirstChangeNotification failed for "
                 << dir.value();
     return false;
@@ -272,3 +276,6 @@ void FilePathWatcherImpl::DestroyWatch() {
 FilePathWatcher::FilePathWatcher() {
   impl_ = new FilePathWatcherImpl();
 }
+
+}  // namespace files
+}  // namespace base