| Index: sandbox/src/process_policy_test.cc
|
| diff --git a/sandbox/src/process_policy_test.cc b/sandbox/src/process_policy_test.cc
|
| index 0fbf20447baa7544429d2de888f5aa1d1d59d8cb..86816719dc1931b2cc69385b02539717cda170c7 100644
|
| --- a/sandbox/src/process_policy_test.cc
|
| +++ b/sandbox/src/process_policy_test.cc
|
| @@ -1,17 +1,17 @@
|
| -// Copyright (c) 2006-2008 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 <string>
|
| #include <memory>
|
| +#include <string>
|
|
|
| -#include "base/scoped_handle_win.h"
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| +#include "base/win/scoped_handle.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;
|
| }
|
|
|
| - ScopedHandle process(pi.hProcess);
|
| - ScopedHandle thread(pi.hThread);
|
| + base::win::ScopedHandle process(pi.hProcess);
|
| + base::win::ScopedHandle thread(pi.hThread);
|
|
|
| HANDLE token = NULL;
|
| BOOL result = ::OpenProcessToken(process.Get(), TOKEN_IMPERSONATE, &token);
|
| DWORD error = ::GetLastError();
|
|
|
| - ScopedHandle token_handle(token);
|
| + base::win::ScopedHandle token_handle(token);
|
|
|
| if (!::TerminateProcess(process.Get(), 0))
|
| return SBOX_TEST_FAILED;
|
|
|