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

Side by Side Diff: base/files/file_util_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_util_proxy_unittest.cc ('k') | base/files/important_file_writer_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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #include <shlobj.h> 10 #include <shlobj.h>
(...skipping 16 matching lines...) Expand all
27 #include "base/files/file_enumerator.h" 27 #include "base/files/file_enumerator.h"
28 #include "base/files/file_path.h" 28 #include "base/files/file_path.h"
29 #include "base/files/file_util.h" 29 #include "base/files/file_util.h"
30 #include "base/files/scoped_file.h" 30 #include "base/files/scoped_file.h"
31 #include "base/files/scoped_temp_dir.h" 31 #include "base/files/scoped_temp_dir.h"
32 #include "base/path_service.h" 32 #include "base/path_service.h"
33 #include "base/strings/string_util.h" 33 #include "base/strings/string_util.h"
34 #include "base/strings/utf_string_conversions.h" 34 #include "base/strings/utf_string_conversions.h"
35 #include "base/test/test_file_util.h" 35 #include "base/test/test_file_util.h"
36 #include "base/threading/platform_thread.h" 36 #include "base/threading/platform_thread.h"
37 #include "testing/gtest/include/gtest/gtest.h" 37 #include "testing/gtest/googletest/include/gtest/gtest.h"
38 #include "testing/platform_test.h" 38 #include "testing/platform_test.h"
39 39
40 #if defined(OS_WIN) 40 #if defined(OS_WIN)
41 #include "base/win/scoped_handle.h" 41 #include "base/win/scoped_handle.h"
42 #include "base/win/windows_version.h" 42 #include "base/win/windows_version.h"
43 #endif 43 #endif
44 44
45 #if defined(OS_ANDROID) 45 #if defined(OS_ANDROID)
46 #include "base/android/content_uri_utils.h" 46 #include "base/android/content_uri_utils.h"
47 #endif 47 #endif
(...skipping 2470 matching lines...) Expand 10 before | Expand all | Expand 10 after
2518 // Trying to close it should crash. This is important for security. 2518 // Trying to close it should crash. This is important for security.
2519 EXPECT_DEATH(CloseWithScopedFD(fds[1]), ""); 2519 EXPECT_DEATH(CloseWithScopedFD(fds[1]), "");
2520 #endif 2520 #endif
2521 } 2521 }
2522 2522
2523 #endif // defined(OS_POSIX) 2523 #endif // defined(OS_POSIX)
2524 2524
2525 } // namespace 2525 } // namespace
2526 2526
2527 } // namespace base 2527 } // namespace base
OLDNEW
« no previous file with comments | « base/files/file_util_proxy_unittest.cc ('k') | base/files/important_file_writer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698