diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-09 16:32:20 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-09 16:32:20 +0000 |
| commit | b90d7e80c20c7c20831bedfe3fa6028ddab1ae95 (patch) | |
| tree | 308e927055c27a533019d329a9677ce8e7c53e33 /base/file_util_unittest.cc | |
| parent | d716d4178136a223e9e79b3508c755a71108a068 (diff) | |
| download | chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.zip chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.gz chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.bz2 | |
Reland "Remove base/scoped_handle_win.h."
Fixed the problem with rlz library. Now should be fine to land this again.
This reverts commit 3620d9501af7bff688862c54fdd60f7eb41797f3.
Original Review URL: http://codereview.chromium.org/6126002/
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6110005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_unittest.cc')
| -rw-r--r-- | base/file_util_unittest.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc index bbd888a..6ea94e4 100644 --- a/base/file_util_unittest.cc +++ b/base/file_util_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -19,7 +19,6 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/scoped_handle.h" #include "base/scoped_temp_dir.h" #include "base/threading/platform_thread.h" #include "base/time.h" @@ -27,6 +26,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#if defined(OS_WIN) +#include "base/win/scoped_handle.h" +#endif + // This macro helps avoid wrapped lines in the test structs. #define FPL(x) FILE_PATH_LITERAL(x) @@ -471,7 +474,7 @@ TEST_F(FileUtilTest, NormalizeFilePathReparsePoints) { FilePath to_sub_a = base_b.Append(FPL("to_sub_a")); ASSERT_TRUE(file_util::CreateDirectory(to_sub_a)); - ScopedHandle reparse_to_sub_a( + base::win::ScopedHandle reparse_to_sub_a( ::CreateFile(to_sub_a.value().c_str(), FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, @@ -484,7 +487,7 @@ TEST_F(FileUtilTest, NormalizeFilePathReparsePoints) { FilePath to_base_b = base_b.Append(FPL("to_base_b")); ASSERT_TRUE(file_util::CreateDirectory(to_base_b)); - ScopedHandle reparse_to_base_b( + base::win::ScopedHandle reparse_to_base_b( ::CreateFile(to_base_b.value().c_str(), FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, @@ -497,7 +500,7 @@ TEST_F(FileUtilTest, NormalizeFilePathReparsePoints) { FilePath to_sub_long = base_b.Append(FPL("to_sub_long")); ASSERT_TRUE(file_util::CreateDirectory(to_sub_long)); - ScopedHandle reparse_to_sub_long( + base::win::ScopedHandle reparse_to_sub_long( ::CreateFile(to_sub_long.value().c_str(), FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, |