Make FilePath accept FilePath as Append parameter.

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/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:
@@ skipping 93 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) {
-  FilePath subdir = test_dir_.Append(FILE_PATH_LITERAL("SubDir"));
-  ASSERT_TRUE(file_util::CreateDirectory(subdir.value()));
+#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.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();
 
   // We shouldn't have been notified and shouldn't have crashed.
-  ASSERT_EQ(directory_mods_, 0);
+  ASSERT_EQ(0, directory_mods_);
 }
 
 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 10 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);
 }