Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Side by Side Diff: base/files/file_path_watcher_unittest.cc

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/files/file_path_unittest.cc ('k') | base/files/file_proxy_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/files/file_path_watcher.h" 5 #include "base/files/file_path_watcher.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <aclapi.h> 9 #include <aclapi.h>
10 #elif defined(OS_POSIX) 10 #elif defined(OS_POSIX)
(...skipping 12 matching lines...) Expand all
23 #include "base/location.h" 23 #include "base/location.h"
24 #include "base/run_loop.h" 24 #include "base/run_loop.h"
25 #include "base/single_thread_task_runner.h" 25 #include "base/single_thread_task_runner.h"
26 #include "base/stl_util.h" 26 #include "base/stl_util.h"
27 #include "base/strings/stringprintf.h" 27 #include "base/strings/stringprintf.h"
28 #include "base/synchronization/waitable_event.h" 28 #include "base/synchronization/waitable_event.h"
29 #include "base/test/test_file_util.h" 29 #include "base/test/test_file_util.h"
30 #include "base/test/test_timeouts.h" 30 #include "base/test/test_timeouts.h"
31 #include "base/thread_task_runner_handle.h" 31 #include "base/thread_task_runner_handle.h"
32 #include "base/threading/thread.h" 32 #include "base/threading/thread.h"
33 #include "testing/gtest/include/gtest/gtest.h" 33 #include "testing/gtest/googletest/include/gtest/gtest.h"
34 34
35 #if defined(OS_ANDROID) 35 #if defined(OS_ANDROID)
36 #include "base/android/path_utils.h" 36 #include "base/android/path_utils.h"
37 #endif // defined(OS_ANDROID) 37 #endif // defined(OS_ANDROID)
38 38
39 namespace base { 39 namespace base {
40 40
41 namespace { 41 namespace {
42 42
43 class TestDelegate; 43 class TestDelegate;
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, false)); 899 ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, false));
900 ASSERT_TRUE(WaitForEvents()); 900 ASSERT_TRUE(WaitForEvents());
901 ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); 901 ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true));
902 DeleteDelegateOnFileThread(delegate.release()); 902 DeleteDelegateOnFileThread(delegate.release());
903 } 903 }
904 904
905 #endif // OS_MACOSX 905 #endif // OS_MACOSX
906 } // namespace 906 } // namespace
907 907
908 } // namespace base 908 } // namespace base
OLDNEW
« no previous file with comments | « base/files/file_path_unittest.cc ('k') | base/files/file_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698