Moving file_util::FileInfo to base::PlatformFileInfo, and adding the...

chrome/browser/file_path_watcher_win.cc

 // Copyright (c) 2009 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 "chrome/browser/file_path_watcher.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/object_watcher.h"
@@ skipping 81 matching lines @@
   DCHECK(object == handle_);
   // Make sure we stay alive through the body of this function.
   scoped_refptr<FilePathWatcherImpl> keep_alive(this);
 
   if (!UpdateWatch()) {
     delegate_->OnError();
     return;
   }
 
   // Check whether the event applies to |target_| and notify the delegate.
-  file_util::FileInfo file_info;
+  base::PlatformFileInfo file_info;
   bool file_exists = file_util::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();
     delegate_->OnFilePathChanged(target_);
   } 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
@@ skipping 63 matching lines @@
     return false;
   }
 
   return true;
 }
 
 bool FilePathWatcherImpl::UpdateWatch() {
   if (handle_ != INVALID_HANDLE_VALUE)
     DestroyWatch();
 
-  file_util::FileInfo file_info;
+  base::PlatformFileInfo file_info;
   if (file_util::GetFileInfo(target_, &file_info)) {
     last_modified_ = file_info.last_modified;
     first_notification_ = base::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_);
@@ skipping 37 matching lines @@
   watcher_.StopWatching();
   FindCloseChangeNotification(handle_);
   handle_ = INVALID_HANDLE_VALUE;
 }
 
 }  // namespace
 
 FilePathWatcher::FilePathWatcher() {
   impl_ = new FilePathWatcherImpl();
 }