Add user script support to extensions.

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"
 
@@ skipping 110 matching lines @@
 
   // 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();
 
   ASSERT_EQ(directory_mods_, 0);
 }
 
-// Verify that modifications to a subdirectory isn't noticed.
+// Verify that modifications to a subdirectory are 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
   FilePath subdir(FILE_PATH_LITERAL("SubDir"));
   ASSERT_TRUE(file_util::CreateDirectory(test_dir_.Append(subdir)));
 
   DirectoryWatcher watcher;
   ASSERT_TRUE(watcher.Watch(test_dir_, this));
   // Write a file to the subdir.
   FilePath test_path = subdir.AppendASCII("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();
-
-  // We shouldn't have been notified and shouldn't have crashed.
-  ASSERT_EQ(0, directory_mods_);
+  LoopUntilModsEqual(2);
 }
 
 namespace {
 // Used by the DeleteDuringNotify test below.
 // Deletes the DirectoryWatcher when it's notified.
 class Deleter : public DirectoryWatcher::Delegate {
  public:
   Deleter(DirectoryWatcher* watcher) : watcher_(watcher) {}
   virtual void OnDirectoryChanged(const FilePath& path) {
     watcher_.reset(NULL);
@@ skipping 18 matching lines @@
   ASSERT_TRUE(deleter.watcher_.get() == NULL);
 }
 
 // Verify that watching a directory that doesn't exist fails, but doesn't
 // asssert.
 // Basic test: add a file and verify we notice it.
 TEST_F(DirectoryWatcherTest, NonExistentDirectory) {
   DirectoryWatcher watcher;
   ASSERT_FALSE(watcher.Watch(test_dir_.AppendASCII("does-not-exist"), this));
 }