Properly fix DirWatcherTest.SubDir on Vista.

base/directory_watcher_unittest.cc

 // Copyright (c) 2008 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/directory_watcher.h"
 
 #include <fstream>
 
-#include "build/build_config.h"
-
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/platform_thread.h"
 #include "base/string_util.h"
-#if defined(OS_WIN)
-#include "base/win_util.h"
-#endif
 #include "testing/gtest/include/gtest/gtest.h"
 
 // For tests where we wait a bit to verify nothing happened
 namespace {
 const int kWaitForEventTime = 500;
 }
 
 class DirectoryWatcherTest : public testing::Test,
                              public DirectoryWatcher::Delegate {
  protected:
   virtual void SetUp() {
     // Name a subdirectory of the temp directory.
     std::wstring path_str;
     ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &path_str));
     test_dir_ = FilePath(path_str).Append(
         FILE_PATH_LITERAL("DirectoryWatcherTest"));
 
     // Create a fresh, empty copy of this directory.
     file_util::Delete(test_dir_.value(), true);
     file_util::CreateDirectory(test_dir_.value());
 
     directory_mods_ = 0;
     quit_mod_count_ = 0;
   }
 
   virtual void OnDirectoryChanged(const FilePath& path) {
+    EXPECT_EQ(path.value(), test_dir_.value());
     ++directory_mods_;
     if (directory_mods_ == quit_mod_count_)
       MessageLoop::current()->Quit();
   }
 
   virtual void TearDown() {
     // Clean up test directory.
     ASSERT_TRUE(file_util::Delete(test_dir_.value(), true));
     ASSERT_FALSE(file_util::PathExists(test_dir_.value()));
   }
@@ skipping 30 matching lines @@
 
 // Basic test: add a file and verify we notice it.
 TEST_F(DirectoryWatcherTest, NewFile) {
   DirectoryWatcher watcher;
   ASSERT_TRUE(watcher.Watch(test_dir_, this));
 
   WriteTestDirFile(FILE_PATH_LITERAL("test_file"), "some content");
   LoopUntilModsEqual(2);
 }
 
+TEST_F(DirectoryWatcherTest, NewDir) {
+  DirectoryWatcher watcher;
+  ASSERT_TRUE(watcher.Watch(test_dir_, this));
+
+  FilePath subdir(FILE_PATH_LITERAL("SubDir"));
+  ASSERT_TRUE(file_util::CreateDirectory(test_dir_.Append(subdir)));
+
+  LoopUntilModsEqual(1);
+}
+
 // Verify that modifying a file is caught.
 TEST_F(DirectoryWatcherTest, ModifiedFile) {
   DirectoryWatcher watcher;
   ASSERT_TRUE(watcher.Watch(test_dir_, this));
 
   // Write a file to the test dir.
   WriteTestDirFile(FILE_PATH_LITERAL("test_file"), "some content");
   LoopUntilModsEqual(2);
 
   // Now make sure we get notified if the file is modified.
@@ skipping 17 matching lines @@
   // that notification doesn't come.
   loop_.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask,
                         kWaitForEventTime);
   loop_.Run();
 
   ASSERT_EQ(directory_mods_, 0);
 }
 
 // Verify that modifications to a subdirectory isn't noticed.
 TEST_F(DirectoryWatcherTest, SubDir) {
-#if defined(OS_WIN)
-  // Temporarily disabling test on Vista, see
-  // http://code.google.com/p/chromium/issues/detail?id=5072
-  // TODO: Enable this test, quickly.
-  if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA)
-    return;
-#endif
+  DirectoryWatcher watcher;
+  ASSERT_TRUE(watcher.Watch(test_dir_, this));
+
   FilePath subdir(FILE_PATH_LITERAL("SubDir"));
   ASSERT_TRUE(file_util::CreateDirectory(test_dir_.Append(subdir)));
 
-  DirectoryWatcher watcher;
-  ASSERT_TRUE(watcher.Watch(test_dir_, this));
+  LoopUntilModsEqual(1);
+
+  // Wait to make sure we also clear some late notifications.
+  PlatformThread::Sleep(2 * kWaitForEventTime);
+  directory_mods_ = 0;
+
   // Write a file to the subdir.
   FilePath test_path = subdir.Append(FILE_PATH_LITERAL("test_file"));
   WriteTestDirFile(test_path.value(), "some content");
 
   // We won't get a notification, so we just wait around a bit to verify
   // that notification doesn't come.
   loop_.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask,
                         kWaitForEventTime);
   loop_.Run();
 
@@ skipping 22 matching lines @@
   Deleter deleter(watcher);  // Takes ownership of watcher.
   ASSERT_TRUE(watcher->Watch(test_dir_, &deleter));
 
   WriteTestDirFile(FILE_PATH_LITERAL("test_file"), "some content");
   LoopUntilModsEqual(2);
 
   // We win if we haven't crashed yet.
   // Might as well double-check it got deleted, too.
   ASSERT_TRUE(deleter.watcher_.get() == NULL);
 }