Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace.

sandbox/src/file_policy_test.cc

-// 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"
 #include "sandbox/src/sandbox_policy.h"
 #include "sandbox/src/win_utils.h"
 #include "sandbox/tests/common/controller.h"
 #include "sandbox/tests/common/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define BINDNTDLL(name) \
   name ## Function name = reinterpret_cast<name ## Function>( \
     ::GetProcAddress(::GetModuleHandle(L"ntdll.dll"), #name))
 
 namespace sandbox {
 
 const ULONG kSharing = FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE;
 
 // Creates a file using different desired access. Returns if the call succeeded
 // or not.  The first argument in argv is the filename. If the second argument
 // is "read", we try read only access. Otherwise we try read-write access.
 SBOX_TESTS_COMMAND int File_Create(int argc, wchar_t **argv) {
   if (argc != 2)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   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;
     return SBOX_TEST_DENIED;
   }
 }
 
 SBOX_TESTS_COMMAND int File_Win32Create(int argc, wchar_t **argv) {
   if (argc != 1) {
     SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
@@ skipping 526 matching lines @@
   EXPECT_TRUE(INVALID_HANDLE_VALUE != dir);
   EXPECT_TRUE(DeleteReparsePoint(dir));
   EXPECT_TRUE(::CloseHandle(dir));
 
   // Cleanup.
   EXPECT_TRUE(::DeleteFile(temp_file_in_temp.c_str()));
   EXPECT_TRUE(::RemoveDirectory(subfolder.c_str()));
 }
 
 }  // namespace sandbox