Index: sandbox/src/file_policy_test.cc |
diff --git a/sandbox/src/file_policy_test.cc b/sandbox/src/file_policy_test.cc |
index 2abf6e21d617fb77f917e3f7e997496147e6fc72..df1e903cb496ce210f7f6a69f9fa91a2ae1b870e 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; |