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

chrome_frame/test_utils.cc

Index: chrome_frame/test_utils.cc
===================================================================
--- chrome_frame/test_utils.cc	(revision 237598)
+++ chrome_frame/test_utils.cc	(working copy)
@@ -88,7 +88,7 @@
 
   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)
@@ -111,12 +111,13 @@
         << "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.";
     }
   }