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

sandbox/src/restricted_token_utils.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 <aclapi.h>
 #include <sddl.h>
 #include <vector>
 
 #include "sandbox/src/restricted_token_utils.h"
 
 #include "base/logging.h"
-#include "base/scoped_handle_win.h"
+#include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "sandbox/src/job.h"
 #include "sandbox/src/restricted_token.h"
 #include "sandbox/src/security_level.h"
 #include "sandbox/src/sid.h"
 
 namespace sandbox {
 
 DWORD CreateRestrictedToken(HANDLE *token_handle,
                             TokenLevel security_level,
@@ skipping 136 matching lines @@
 
   // Create the primary (restricted) token for the process
   HANDLE primary_token_handle = NULL;
   err_code = CreateRestrictedToken(&primary_token_handle,
                                    primary_level,
                                    INTEGRITY_LEVEL_LAST,
                                    PRIMARY);
   if (ERROR_SUCCESS != err_code) {
     return err_code;
   }
-  ScopedHandle primary_token(primary_token_handle);
+  base::win::ScopedHandle primary_token(primary_token_handle);
 
   // Create the impersonation token (restricted) to be able to start the
   // process.
   HANDLE impersonation_token_handle;
   err_code = CreateRestrictedToken(&impersonation_token_handle,
                                    impersonation_level,
                                    INTEGRITY_LEVEL_LAST,
                                    IMPERSONATION);
   if (ERROR_SUCCESS != err_code) {
     return err_code;
   }
-  ScopedHandle impersonation_token(impersonation_token_handle);
+  base::win::ScopedHandle impersonation_token(impersonation_token_handle);
 
   // Start the process
   STARTUPINFO startup_info = {0};
   PROCESS_INFORMATION process_info = {0};
 
   if (!::CreateProcessAsUser(primary_token.Get(),
                              NULL,   // No application name.
                              command_line,
                              NULL,   // No security attribute.
                              NULL,   // No thread attribute.
                              FALSE,  // Do not inherit handles.
                              CREATE_SUSPENDED | CREATE_BREAKAWAY_FROM_JOB,
                              NULL,   // Use the environment of the caller.
                              NULL,   // Use current directory of the caller.
                              &startup_info,
                              &process_info)) {
     return ::GetLastError();
   }
 
-  ScopedHandle thread_handle(process_info.hThread);
-  ScopedHandle process_handle(process_info.hProcess);
+  base::win::ScopedHandle thread_handle(process_info.hThread);
+  base::win::ScopedHandle process_handle(process_info.hProcess);
 
   // Change the token of the main thread of the new process for the
   // impersonation token with more rights.
   if (!::SetThreadToken(&process_info.hThread, impersonation_token.Get())) {
     ::TerminateProcess(process_handle.Get(),
                        0);  // exit code
     return ::GetLastError();
   }
 
   err_code = job.AssignProcessToJob(process_handle.Get());
@@ skipping 115 matching lines @@
                                         ace_access.c_str(),
                                         integrity_level_str);
   if (ERROR_SUCCESS != error)
     return error;
 
   HANDLE token_handle;
   if (!::OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_DEFAULT,
                           &token_handle))
     return ::GetLastError();
 
-  ScopedHandle token(token_handle);
+  base::win::ScopedHandle token(token_handle);
 
   return SetTokenIntegrityLevel(token.Get(), integrity_level);
 }
 
-
 }  // namespace sandbox