Reland "Remove base/scoped_handle_win.h."

sandbox/src/sync_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 "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/nt_internals.h"
 #include "sandbox/tests/common/controller.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
 
 SBOX_TESTS_COMMAND int Event_Open(int argc, wchar_t **argv) {
   if (argc != 2)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   DWORD desired_access = SYNCHRONIZE;
   if (L'f' == argv[0][0])
     desired_access = EVENT_ALL_ACCESS;
 
-  ScopedHandle event_open(::OpenEvent(desired_access, FALSE, argv[1]));
+  base::win::ScopedHandle event_open(::OpenEvent(
+      desired_access, FALSE, argv[1]));
   DWORD error_open = ::GetLastError();
 
   if (event_open.Get())
     return SBOX_TEST_SUCCEEDED;
 
   if (ERROR_ACCESS_DENIED == error_open ||
       ERROR_BAD_PATHNAME == error_open)
     return SBOX_TEST_DENIED;
 
   return SBOX_TEST_FAILED;
 }
 
 SBOX_TESTS_COMMAND int Event_CreateOpen(int argc, wchar_t **argv) {
   if (argc < 2 || argc > 3)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   wchar_t *event_name = NULL;
   if (3 == argc)
     event_name = argv[2];
 
   BOOL manual_reset = FALSE;
   BOOL initial_state = FALSE;
   if (L't' == argv[0][0])
     manual_reset = TRUE;
   if (L't' == argv[1][0])
     initial_state = TRUE;
 
-  ScopedHandle event_create(::CreateEvent(NULL, manual_reset, initial_state,
-                                          event_name));
+  base::win::ScopedHandle event_create(::CreateEvent(
+      NULL, manual_reset, initial_state, event_name));
   DWORD error_create = ::GetLastError();
-  ScopedHandle event_open;
+  base::win::ScopedHandle event_open;
   if (event_name)
     event_open.Set(::OpenEvent(EVENT_ALL_ACCESS, FALSE, event_name));
 
   if (event_create.Get()) {
     DWORD wait = ::WaitForSingleObject(event_create.Get(), 0);
     if (initial_state && WAIT_OBJECT_0 != wait)
       return SBOX_TEST_FAILED;
 
     if (!initial_state && WAIT_TIMEOUT != wait)
       return SBOX_TEST_FAILED;
@@ skipping 52 matching lines @@
   EXPECT_TRUE(runner.AddRule(TargetPolicy::SUBSYS_SYNC,
                              TargetPolicy::EVENTS_ALLOW_READONLY,
                              L"test2"));
   EXPECT_TRUE(runner.AddRule(TargetPolicy::SUBSYS_SYNC,
                              TargetPolicy::EVENTS_ALLOW_READONLY,
                              L"test5"));
   EXPECT_TRUE(runner.AddRule(TargetPolicy::SUBSYS_SYNC,
                              TargetPolicy::EVENTS_ALLOW_READONLY,
                              L"test6"));
 
-  ScopedHandle handle1(::CreateEvent(NULL, FALSE, FALSE, L"test1"));
-  ScopedHandle handle2(::CreateEvent(NULL, FALSE, FALSE, L"test2"));
-  ScopedHandle handle3(::CreateEvent(NULL, FALSE, FALSE, L"test3"));
-  ScopedHandle handle4(::CreateEvent(NULL, FALSE, FALSE, L"test4"));
+  base::win::ScopedHandle handle1(::CreateEvent(NULL, FALSE, FALSE, L"test1"));
+  base::win::ScopedHandle handle2(::CreateEvent(NULL, FALSE, FALSE, L"test2"));
+  base::win::ScopedHandle handle3(::CreateEvent(NULL, FALSE, FALSE, L"test3"));
+  base::win::ScopedHandle handle4(::CreateEvent(NULL, FALSE, FALSE, L"test4"));
 
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"Event_CreateOpen f f"));
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"Event_CreateOpen t f"));
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(L"Event_Open f test1"));
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"Event_Open s test2"));
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(L"Event_Open f test3"));
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(L"Event_Open s test4"));
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(L"Event_CreateOpen f f test5"));
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(L"Event_CreateOpen t f test6"));
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(L"Event_CreateOpen f t test5"));
   EXPECT_EQ(SBOX_TEST_DENIED, runner.RunTest(L"Event_CreateOpen t t test6"));
 }
 
 }  // namespace sandbox