OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/file_path_watcher/file_path_watcher.h" | 5 #include "chrome/browser/file_path_watcher/file_path_watcher.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
13 #include "base/message_loop_proxy.h" | 13 #include "base/message_loop_proxy.h" |
14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
15 #include "base/scoped_temp_dir.h" | 15 #include "base/scoped_temp_dir.h" |
16 #include "base/string_util.h" | 16 #include "base/string_util.h" |
17 #include "base/stl_util-inl.h" | 17 #include "base/stl_util-inl.h" |
18 #include "base/waitable_event.h" | 18 #include "base/synchronization/waitable_event.h" |
19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
20 | 20 |
21 #if defined(OS_MACOSX) | 21 #if defined(OS_MACOSX) |
22 // TODO(mnissler): There are flakes on Mac (http://crbug.com/54822) at least for | 22 // TODO(mnissler): There are flakes on Mac (http://crbug.com/54822) at least for |
23 // FilePathWatcherTest.MultipleWatchersSingleFile. | 23 // FilePathWatcherTest.MultipleWatchersSingleFile. |
24 #define MAYBE(name) FLAKY_ ## name | 24 #define MAYBE(name) FLAKY_ ## name |
25 #else | 25 #else |
26 #define MAYBE(name) name | 26 #define MAYBE(name) name |
27 #endif | 27 #endif |
28 | 28 |
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
445 SetupWatch(dest_file, &file_watcher, file_delegate.get()); | 445 SetupWatch(dest_file, &file_watcher, file_delegate.get()); |
446 scoped_refptr<TestDelegate> subdir_delegate(new TestDelegate(collector())); | 446 scoped_refptr<TestDelegate> subdir_delegate(new TestDelegate(collector())); |
447 SetupWatch(dest_subdir, &subdir_watcher, subdir_delegate.get()); | 447 SetupWatch(dest_subdir, &subdir_watcher, subdir_delegate.get()); |
448 | 448 |
449 // Move the directory into place, s.t. the watched file appears. | 449 // Move the directory into place, s.t. the watched file appears. |
450 ASSERT_TRUE(file_util::Move(source_dir, dest_dir)); | 450 ASSERT_TRUE(file_util::Move(source_dir, dest_dir)); |
451 WaitForEvents(); | 451 WaitForEvents(); |
452 } | 452 } |
453 | 453 |
454 } // namespace | 454 } // namespace |
OLD | NEW |