Reland "Remove base/scoped_handle_win.h."

sandbox/src/registry_dispatcher.cc

Index: sandbox/src/registry_dispatcher.cc
diff --git a/sandbox/src/registry_dispatcher.cc b/sandbox/src/registry_dispatcher.cc
index 5f537704d7be077cd656ca1732eeef28b1892796..f86c76a7f7ce0bcfcac2f9d4c781078adbae1251 100644
--- a/sandbox/src/registry_dispatcher.cc
+++ b/sandbox/src/registry_dispatcher.cc
@@ -1,10 +1,10 @@
-// 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 "sandbox/src/registry_dispatcher.h"
 
-#include "base/scoped_handle_win.h"
+#include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "sandbox/src/crosscall_client.h"
 #include "sandbox/src/interception.h"
@@ -74,7 +74,7 @@ bool RegistryDispatcher::SetupService(InterceptionManager* manager,
 bool RegistryDispatcher::NtCreateKey(
     IPCInfo* ipc, std::wstring* name, DWORD attributes, HANDLE root,
     DWORD desired_access, DWORD title_index, DWORD create_options) {
-  ScopedHandle root_handle;
+  base::win::ScopedHandle root_handle;
   std::wstring real_path = *name;
 
   // If there is a root directory, we need to duplicate the handle to make
@@ -120,7 +120,7 @@ bool RegistryDispatcher::NtCreateKey(
 bool RegistryDispatcher::NtOpenKey(IPCInfo* ipc, std::wstring* name,
                                    DWORD attributes, HANDLE root,
                                    DWORD desired_access) {
-  ScopedHandle root_handle;
+  base::win::ScopedHandle root_handle;
   std::wstring real_path = *name;
 
   // If there is a root directory, we need to duplicate the handle to make