Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

chrome_frame/test_utils.cc

 // Copyright (c) 2012 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 "chrome_frame/test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <shellapi.h>
 
@@ skipping 70 matching lines @@
     "DllUnregisterUserServer",
   };
 
   DCHECK(!path.empty());
   DCHECK(registration_type == PER_USER || registration_type == SYSTEM_LEVEL);
   DCHECK(registration_operation == REGISTER ||
          registration_operation == UNREGISTER);
 
   int entrypoint_index = 0;
   base::LaunchOptions launch_options;
-  base::win::ScopedHandle process_handle;
+  base::ProcessHandle process_handle = INVALID_HANDLE_VALUE;
   int exit_code = -1;
 
   if (registration_type == PER_USER)
     entrypoint_index += 2;
   if (registration_operation == UNREGISTER)
     entrypoint_index += 1;
   string16 registration_command(ASCIIToUTF16("\""));
   registration_command +=
       CommandLine::ForCurrentProcess()->GetProgram().value();
   registration_command += ASCIIToUTF16("\" ");
   registration_command += kCallRegistrationEntrypointSwitch;
   registration_command += ASCIIToUTF16(" \"");
   registration_command += path;
   registration_command += ASCIIToUTF16("\" ");
   registration_command += ASCIIToUTF16(kEntrypoints[entrypoint_index]);
   launch_options.wait = true;
   if (!base::LaunchProcess(registration_command, launch_options,
                            &process_handle)) {
     PLOG(FATAL)
         << "Failed to register or unregister DLL with command: "
         << registration_command;
   } else {
+    base::win::ScopedHandle rundll32(process_handle);
     if (!base::WaitForExitCodeWithTimeout(
-            process_handle.Get(), &exit_code,
+            process_handle, &exit_code,
             base::TimeDelta::FromMilliseconds(kDllRegistrationTimeoutMs))) {
       LOG(ERROR) << "Timeout waiting to register or unregister DLL with "
                     "command: " << registration_command;
-      base::KillProcess(process_handle.Get(), 0, false);
+      base::KillProcess(process_handle, 0, false);
       NOTREACHED() << "Aborting test due to registration failure.";
     }
   }
   if (exit_code != 0) {
     if (registration_operation == REGISTER) {
       LOG(ERROR)
           << "DLL registration failed (exit code: 0x" << std::hex << exit_code
           << ", command: " << registration_command
           << "). Make sure you are running as Admin.";
       ::ExitProcess(1);
@@ skipping 147 matching lines @@
       UOI_NAME,
       name,
       sizeof(name),
       &needed)) {
         is_locked = lstrcmpi(name, L"default") != 0;
     }
     ::CloseDesktop(input_desk);
   }
   return is_locked;
 }