Fix file path notification filtering on Windows.

base/files/file_path_watcher_win.cc

Index: base/files/file_path_watcher_win.cc
diff --git a/base/files/file_path_watcher_win.cc b/base/files/file_path_watcher_win.cc
index 34b47cead91860a182c8c43a1b640ffb00b34e70..2b29cf0a814d1ce8bca857781b8b55485515b9a4 100644
--- a/base/files/file_path_watcher_win.cc
+++ b/base/files/file_path_watcher_win.cc
@@ -97,6 +97,12 @@ bool FilePathWatcherImpl::Watch(const FilePath& path,
   recursive_watch_ = recursive;
   MessageLoop::current()->AddDestructionObserver(this);
 
+  File::Info file_info;
+  if (GetFileInfo(target_, &file_info)) {
+    last_modified_ = file_info.last_modified;
+    first_notification_ = Time::Now();
+  }
+
   if (!UpdateWatch())
     return false;
 
@@ -151,12 +157,21 @@ void FilePathWatcherImpl::OnObjectSignaled(HANDLE object) {
   // Check whether the event applies to |target_| and notify the callback.
   File::Info file_info;
   bool file_exists = GetFileInfo(target_, &file_info);
-  if (file_exists && (last_modified_.is_null() ||
+  if (recursive_watch_) {
+    // Only the mtime of |target_| is tracked but in a recursive watch,
+    // some other file or directory may have changed so all notifications
+    // are passed through. It is possible to figure out which file changed
+    // using ReadDirectoryChangesW() instead of FindFirstChangeNotification(),
+    // but that function is quite complicated:
+    // http://qualapps.blogspot.com/2010/05/understanding-readdirectorychangesw.html
+    callback_.Run(target_, false);
+  } else if (file_exists && (last_modified_.is_null() ||
       last_modified_ != file_info.last_modified)) {

[Mattias Nissler (ping if slow), 2014/05/14 10:27:52]

nit: align at ( for readability

[vandebo (ex-Chrome), 2014/05/14 16:55:41]

Oops, fixed.

     last_modified_ = file_info.last_modified;
     first_notification_ = Time::Now();
     callback_.Run(target_, false);
-  } else if (file_exists && !first_notification_.is_null()) {
+  } else if (file_exists && last_modified_ == file_info.last_modified &&
+             !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
@@ -230,12 +245,6 @@ bool FilePathWatcherImpl::UpdateWatch() {
   if (handle_ != INVALID_HANDLE_VALUE)
     DestroyWatch();
 
-  File::Info file_info;
-  if (GetFileInfo(target_, &file_info)) {
-    last_modified_ = file_info.last_modified;
-    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.