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 /sandbox/src/file_policy_test.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 'sandbox/src/file_policy_test.cc')
| -rw-r--r-- | sandbox/src/file_policy_test.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sandbox/src/file_policy_test.cc b/sandbox/src/file_policy_test.cc index 2abf6e2..df1e903 100644 --- a/sandbox/src/file_policy_test.cc +++ b/sandbox/src/file_policy_test.cc @@ -1,13 +1,14 @@ -// 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. + #include <algorithm> #include <cctype> #include <windows.h> #include <winioctl.h> -#include "base/scoped_handle_win.h" +#include "base/win/scoped_handle.h" #include "sandbox/src/nt_internals.h" #include "sandbox/src/sandbox.h" #include "sandbox/src/sandbox_factory.h" @@ -35,19 +36,20 @@ SBOX_TESTS_COMMAND int File_Create(int argc, wchar_t **argv) { bool read = (_wcsicmp(argv[0], L"Read") == 0); if (read) { - ScopedHandle file1(CreateFile(argv[1], GENERIC_READ, kSharing, NULL, - OPEN_EXISTING, 0, NULL)); - ScopedHandle file2(CreateFile(argv[1], FILE_EXECUTE, kSharing, NULL, - OPEN_EXISTING, 0, NULL)); + base::win::ScopedHandle file1(CreateFile( + argv[1], GENERIC_READ, kSharing, NULL, OPEN_EXISTING, 0, NULL)); + base::win::ScopedHandle file2(CreateFile( + argv[1], FILE_EXECUTE, kSharing, NULL, OPEN_EXISTING, 0, NULL)); if (file1.Get() && file2.Get()) return SBOX_TEST_SUCCEEDED; return SBOX_TEST_DENIED; } else { - ScopedHandle file1(CreateFile(argv[1], GENERIC_ALL, kSharing, NULL, - OPEN_EXISTING, 0, NULL)); - ScopedHandle file2(CreateFile(argv[1], GENERIC_READ | FILE_WRITE_DATA, - kSharing, NULL, OPEN_EXISTING, 0, NULL)); + base::win::ScopedHandle file1(CreateFile( + argv[1], GENERIC_ALL, kSharing, NULL, OPEN_EXISTING, 0, NULL)); + base::win::ScopedHandle file2(CreateFile( + argv[1], GENERIC_READ | FILE_WRITE_DATA, kSharing, NULL, OPEN_EXISTING, + 0, NULL)); if (file1.Get() && file2.Get()) return SBOX_TEST_SUCCEEDED; |