diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 23:21:55 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 23:21:55 +0000 |
commit | 15d96941d9694b696f14ce4beaada3907828edc5 (patch) | |
tree | 5c5c8d3eb5cee2388fdd2f26de859e84ddfb6657 /sandbox/src/process_policy_test.cc | |
parent | ff81c190a987065d3d3f394af4c1a591417cb5ab (diff) | |
download | chromium_src-15d96941d9694b696f14ce4beaada3907828edc5.zip chromium_src-15d96941d9694b696f14ce4beaada3907828edc5.tar.gz chromium_src-15d96941d9694b696f14ce4beaada3907828edc5.tar.bz2 |
Revert "Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace."
This reverts r 70795, it broke the build.
TBR=vandebo
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src/process_policy_test.cc')
-rw-r--r-- | sandbox/src/process_policy_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sandbox/src/process_policy_test.cc b/sandbox/src/process_policy_test.cc index 8681671..0fbf204 100644 --- a/sandbox/src/process_policy_test.cc +++ b/sandbox/src/process_policy_test.cc @@ -1,17 +1,17 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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 <memory> #include <string> +#include <memory> -#include "base/win/scoped_handle.h" +#include "base/scoped_handle_win.h" +#include "testing/gtest/include/gtest/gtest.h" #include "sandbox/src/sandbox.h" #include "sandbox/src/sandbox_policy.h" #include "sandbox/src/sandbox_factory.h" #include "sandbox/src/sandbox_utils.h" #include "sandbox/tests/common/controller.h" -#include "testing/gtest/include/gtest/gtest.h" namespace { @@ -178,14 +178,14 @@ SBOX_TESTS_COMMAND int Process_GetChildProcessToken(int argc, wchar_t **argv) { return SBOX_TEST_FAILED; } - base::win::ScopedHandle process(pi.hProcess); - base::win::ScopedHandle thread(pi.hThread); + ScopedHandle process(pi.hProcess); + ScopedHandle thread(pi.hThread); HANDLE token = NULL; BOOL result = ::OpenProcessToken(process.Get(), TOKEN_IMPERSONATE, &token); DWORD error = ::GetLastError(); - base::win::ScopedHandle token_handle(token); + ScopedHandle token_handle(token); if (!::TerminateProcess(process.Get(), 0)) return SBOX_TEST_FAILED; |