Revert of https://codereview.chromium.org/71013004/

Reason for revert: Causing compile failure in chrome_util.cc on "Google Chrome Win" http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/21803

TBR=cpu@chromium.org,jvoung@chromium.org,thakis@chromium.org,sergeyu@chromium.org,grt@chromium.org,gene@chromium.org,youngki@chromium.org,rvargas@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/90963002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237541 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 9 deletions

diff --git a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
index bb1dedc..0a66e7d 100644
--- a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
+++ b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
@@ -40,11 +40,11 @@ HANDLE LaunchCommandDirectly(const std::wstring& command_field) {
       std::wstring command_line;
       if (version_key.ReadValue(command_field.c_str(),
                                 &command_line) == ERROR_SUCCESS) {
-        base::win::ScopedHandle launched_process;
+        HANDLE launched_process = NULL;
         base::LaunchOptions options;
         options.start_hidden = true;
         if (base::LaunchProcess(command_line, options, &launched_process)) {
-          return launched_process.Take();
+          return launched_process;
         }
       }
     }
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index c614214..6c7fb48 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -640,7 +640,7 @@ base::ProcessHandle StartCrashService() {
     return NULL;
   }
 
-  base::win::ScopedHandle crash_service;
+  base::ProcessHandle crash_service = NULL;
 
   VLOG(1) << "Starting crash_service.exe so you know if a test crashes!";
 
@@ -656,7 +656,7 @@ base::ProcessHandle StartCrashService() {
   if (DetectRunningCrashService(kCrashServiceStartupTimeoutMs)) {
     VLOG(1) << "crash_service.exe is ready for clients in "
             << (base::Time::Now() - start).InMilliseconds() << " ms.";
-    return crash_service.Take();
+    return crash_service;
   } else {
     LOG(ERROR) << "crash_service.exe failed to accept client connections "
                   "within " << kCrashServiceStartupTimeoutMs << " ms. "
@@ -664,8 +664,8 @@ base::ProcessHandle StartCrashService() {
 
     // First check to see if it's even still running just to minimize the
     // likelihood of spurious error messages from KillProcess.
-    if (WAIT_OBJECT_0 != ::WaitForSingleObject(crash_service.Get(), 0)) {
-      base::KillProcess(crash_service.Get(), 0, false);
+    if (WAIT_OBJECT_0 != ::WaitForSingleObject(crash_service, 0)) {
+      base::KillProcess(crash_service, 0, false);
     }
     return NULL;
   }
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index b8884e7..ef78046 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -88,7 +88,7 @@ void ScopedChromeFrameRegistrar::DoRegistration(
 
   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 @@ void ScopedChromeFrameRegistrar::DoRegistration(
         << "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.";
     }
   }