Index: trunk/src/base/files/file_path_watcher_browsertest.cc |
=================================================================== |
--- trunk/src/base/files/file_path_watcher_browsertest.cc (revision 274756) |
+++ trunk/src/base/files/file_path_watcher_browsertest.cc (working copy) |
@@ -205,8 +205,9 @@ |
bool result; |
file_thread_.message_loop_proxy()->PostTask( |
FROM_HERE, |
- base::Bind(SetupWatchCallback, target, watcher, delegate, recursive_watch, |
- &result, &completion)); |
+ base::Bind(SetupWatchCallback, |
+ target, watcher, delegate, recursive_watch, &result, |
+ &completion)); |
completion.Wait(); |
return result; |
} |
@@ -482,7 +483,7 @@ |
DeleteDelegateOnFileThread(subdir_delegate.release()); |
} |
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) |
+#if defined(OS_WIN) || defined(OS_LINUX) |
TEST_F(FilePathWatcherTest, RecursiveWatch) { |
FilePathWatcher watcher; |
FilePath dir(temp_dir_.path().AppendASCII("dir")); |
@@ -547,45 +548,6 @@ |
} |
#endif |
-#if defined(OS_LINUX) || defined(OS_MACOSX) |
-TEST_F(FilePathWatcherTest, RecursiveWithSymLink) { |
- FilePathWatcher watcher; |
- FilePath test_dir(temp_dir_.path().AppendASCII("test_dir")); |
- ASSERT_TRUE(base::CreateDirectory(test_dir)); |
- FilePath symlink(test_dir.AppendASCII("symlink")); |
- scoped_ptr<TestDelegate> delegate(new TestDelegate(collector())); |
- ASSERT_TRUE(SetupWatch(symlink, &watcher, delegate.get(), true)); |
- |
- // Link creation. |
- FilePath target1(temp_dir_.path().AppendASCII("target1")); |
- ASSERT_TRUE(base::CreateSymbolicLink(target1, symlink)); |
- ASSERT_TRUE(WaitForEvents()); |
- |
- // Target1 creation. |
- ASSERT_TRUE(base::CreateDirectory(target1)); |
- ASSERT_TRUE(WaitForEvents()); |
- |
- // Create a file in target1. |
- FilePath target1_file(target1.AppendASCII("file")); |
- ASSERT_TRUE(WriteFile(target1_file, "content")); |
- ASSERT_TRUE(WaitForEvents()); |
- |
- // Link change. |
- FilePath target2(temp_dir_.path().AppendASCII("target2")); |
- ASSERT_TRUE(base::CreateDirectory(target2)); |
- ASSERT_TRUE(base::DeleteFile(symlink, false)); |
- ASSERT_TRUE(base::CreateSymbolicLink(target2, symlink)); |
- ASSERT_TRUE(WaitForEvents()); |
- |
- // Create a file in target2. |
- FilePath target2_file(target2.AppendASCII("file")); |
- ASSERT_TRUE(WriteFile(target2_file, "content")); |
- ASSERT_TRUE(WaitForEvents()); |
- |
- DeleteDelegateOnFileThread(delegate.release()); |
-} |
-#endif |
- |
TEST_F(FilePathWatcherTest, MoveChild) { |
FilePathWatcher file_watcher; |
FilePathWatcher subdir_watcher; |