Reland "Remove base/scoped_handle_win.h."

sandbox/src/process_policy_test.cc

-// 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 <memory>
 #include <string>
-#include <memory>
 
-#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 {
 
 // While the shell API provides better calls than this home brew function
 // we use GetSystemWindowsDirectoryW which does not query the registry so
 // it is safe to use after revert.
 std::wstring MakeFullPathToSystem32(const wchar_t* name) {
   wchar_t windows_path[MAX_PATH] = {0};
   ::GetSystemWindowsDirectoryW(windows_path, MAX_PATH);
   std::wstring full_path(windows_path);
@@ skipping 146 matching lines @@
   std::wstring path = MakeFullPathToSystem32(argv[0]);
 
   PROCESS_INFORMATION pi = {0};
   STARTUPINFOW si = {sizeof(si)};
 
   if (!::CreateProcessW(path.c_str(), NULL, NULL, NULL, FALSE, CREATE_SUSPENDED,
                         NULL, NULL, &si, &pi)) {
       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;
 
   if (result && token)
     return SBOX_TEST_SUCCEEDED;
 
   if (ERROR_ACCESS_DENIED == error)
     return SBOX_TEST_DENIED;
 
@@ skipping 86 matching lines @@
   ASSERT_TRUE(!exe_path.empty());
   EXPECT_TRUE(runner.AddRule(TargetPolicy::SUBSYS_PROCESS,
                              TargetPolicy::PROCESS_ALL_EXEC,
                              exe_path.c_str()));
 
   EXPECT_EQ(SBOX_TEST_SUCCEEDED,
             runner.RunTest(L"Process_GetChildProcessToken findstr.exe"));
 }
 
 }  // namespace sandbox