Move more file_util functions to base namespace.

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 "base/files/file_path_watcher.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 58 matching lines @@
   HANDLE handle_;
 
   // ObjectWatcher to watch handle_ for events.
   base::win::ObjectWatcher watcher_;
 
   // Set to true to watch the sub trees of the specified directory file path.
   bool recursive_watch_;
 
   // Keep track of the last modified time of the file.  We use nulltime
   // to represent the file not existing.
-  base::Time last_modified_;
+  Time last_modified_;
 
   // The time at which we processed the first notification with the
   // |last_modified_| time stamp.
-  base::Time first_notification_;
+  Time first_notification_;
 
   DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl);
 };
 
 bool FilePathWatcherImpl::Watch(const FilePath& path,
                                 bool recursive,
                                 const FilePathWatcher::Callback& callback) {
   DCHECK(target_.value().empty());  // Can only watch one path.
 
-  set_message_loop(base::MessageLoopProxy::current());
+  set_message_loop(MessageLoopProxy::current());
   callback_ = callback;
   target_ = path;
   recursive_watch_ = recursive;
   MessageLoop::current()->AddDestructionObserver(this);
 
   if (!UpdateWatch())
     return false;
 
   watcher_.StartWatching(handle_, this);
 
   return true;
 }
 
 void FilePathWatcherImpl::Cancel() {
   if (callback_.is_null()) {
     // Watch was never called, or the |message_loop_| has already quit.
     set_cancelled();
     return;
   }
 
   // Switch to the file thread if necessary so we can stop |watcher_|.
   if (!message_loop()->BelongsToCurrentThread()) {
     message_loop()->PostTask(FROM_HERE,
-                             base::Bind(&FilePathWatcher::CancelWatch,
-                                        make_scoped_refptr(this)));
+                             Bind(&FilePathWatcher::CancelWatch,
+                                  make_scoped_refptr(this)));
   } else {
     CancelOnMessageLoopThread();
   }
 }
 
 void FilePathWatcherImpl::CancelOnMessageLoopThread() {
   set_cancelled();
 
   if (handle_ != INVALID_HANDLE_VALUE)
     DestroyWatch();
@@ skipping 12 matching lines @@
   DCHECK(object == handle_);
   // Make sure we stay alive through the body of this function.
   scoped_refptr<FilePathWatcherImpl> keep_alive(this);
 
   if (!UpdateWatch()) {
     callback_.Run(target_, true /* error */);
     return;
   }
 
   // Check whether the event applies to |target_| and notify the callback.
-  base::PlatformFileInfo file_info;
-  bool file_exists = file_util::GetFileInfo(target_, &file_info);
+  PlatformFileInfo file_info;
+  bool file_exists = GetFileInfo(target_, &file_info);
   if (file_exists && (last_modified_.is_null() ||
       last_modified_ != file_info.last_modified)) {
     last_modified_ = file_info.last_modified;
-    first_notification_ = base::Time::Now();
+    first_notification_ = Time::Now();
     callback_.Run(target_, false);
   } else if (file_exists && !first_notification_.is_null()) {
     // The target's last modification time is equal to what's on record. This
     // means that either an unrelated event occurred, or the target changed
     // again (file modification times only have a resolution of 1s). Comparing
     // file modification times against the wall clock is not reliable to find
     // out whether the change is recent, since this code might just run too
     // late. Moreover, there's no guarantee that file modification time and wall
     // clock times come from the same source.
     //
     // Instead, the time at which the first notification carrying the current
     // |last_notified_| time stamp is recorded. Later notifications that find
     // the same file modification time only need to be forwarded until wall
     // clock has advanced one second from the initial notification. After that
     // interval, client code is guaranteed to having seen the current revision
     // of the file.
-    if (base::Time::Now() - first_notification_ >
-        base::TimeDelta::FromSeconds(1)) {
+    if (Time::Now() - first_notification_ > TimeDelta::FromSeconds(1)) {
       // Stop further notifications for this |last_modification_| time stamp.
-      first_notification_ = base::Time();
+      first_notification_ = Time();
     }
     callback_.Run(target_, false);
   } else if (!file_exists && !last_modified_.is_null()) {
-    last_modified_ = base::Time();
+    last_modified_ = Time();
     callback_.Run(target_, false);
   }
 
   // The watch may have been cancelled by the callback.
   if (handle_ != INVALID_HANDLE_VALUE)
     watcher_.StartWatching(handle_, this);
 }
 
 // static
 bool FilePathWatcherImpl::SetupWatchHandle(const FilePath& dir,
@@ skipping 32 matching lines @@
     return false;
   }
 
   return true;
 }
 
 bool FilePathWatcherImpl::UpdateWatch() {
   if (handle_ != INVALID_HANDLE_VALUE)
     DestroyWatch();
 
-  base::PlatformFileInfo file_info;
-  if (file_util::GetFileInfo(target_, &file_info)) {
+  PlatformFileInfo file_info;
+  if (GetFileInfo(target_, &file_info)) {
     last_modified_ = file_info.last_modified;
-    first_notification_ = base::Time::Now();
+    first_notification_ = Time::Now();
   }
 
   // Start at the target and walk up the directory chain until we succesfully
   // create a watch handle in |handle_|. |child_dirs| keeps a stack of child
   // directories stripped from target, in reverse order.
   std::vector<FilePath> child_dirs;
   FilePath watched_path(target_);
   while (true) {
     if (!SetupWatchHandle(watched_path, recursive_watch_, &handle_))
       return false;
@@ skipping 36 matching lines @@
   handle_ = INVALID_HANDLE_VALUE;
 }
 
 }  // namespace
 
 FilePathWatcher::FilePathWatcher() {
   impl_ = new FilePathWatcherImpl();
 }
 
 }  // namespace base