Move FilePathWatcher to base/files.

base/files/file_path_watcher_win.cc

 // 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 "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"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
 #include "base/time.h"
 #include "base/win/object_watcher.h"
 
+namespace base {
+namespace files {
+
 namespace {
 
 class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
                             public base::win::ObjectWatcher::Delegate,
                             public MessageLoop::DestructionObserver {
  public:
   FilePathWatcherImpl() : delegate_(NULL), handle_(INVALID_HANDLE_VALUE) {}
 
   // FilePathWatcher::PlatformDelegate overrides.
   virtual bool Watch(const FilePath& path,
@@ skipping 170 matching lines @@
   // If FindFirstChangeNotification failed because the target directory
   // doesn't exist, access is denied (happens if the file is already gone but
   // there are still handles open), or the target is not a directory, try the
   // immediate parent directory instead.
   DWORD error_code = GetLastError();
   if (error_code != ERROR_FILE_NOT_FOUND &&
       error_code != ERROR_PATH_NOT_FOUND &&
       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;
   }
 
   return true;
 }
 
 bool FilePathWatcherImpl::UpdateWatch() {
   if (handle_ != INVALID_HANDLE_VALUE)
@@ skipping 50 matching lines @@
   watcher_.StopWatching();
   FindCloseChangeNotification(handle_);
   handle_ = INVALID_HANDLE_VALUE;
 }
 
 }  // namespace
 
 FilePathWatcher::FilePathWatcher() {
   impl_ = new FilePathWatcherImpl();
 }
+
+}  // namespace files
+}  // namespace base