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

chrome_frame/test/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/chrome_frame_test_utils.h"
 
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <iepmapi.h>
 #include <sddl.h>
@@ skipping 622 matching lines @@
                "existing process and leave it running after tests complete.";
     return NULL;
   }
 
   base::FilePath exe_dir;
   if (!PathService::Get(base::DIR_EXE, &exe_dir)) {
     DCHECK(false);
     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!";
 
   base::FilePath crash_service_path = exe_dir.AppendASCII("crash_service.exe");
   if (!base::LaunchProcess(crash_service_path.value(), base::LaunchOptions(),
                            &crash_service)) {
     LOG(ERROR) << "Couldn't start crash_service.exe";
     return NULL;
   }
 
   base::Time start = base::Time::Now();
 
   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. "
                   "Terminating it now.";
 
     // 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;
   }
 }
 
 ScopedVirtualizeHklmAndHkcu::ScopedVirtualizeHklmAndHkcu() {
   override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE, L"hklm_fake");
   override_manager_.OverrideRegistry(HKEY_CURRENT_USER, L"hkcu_fake");
 }
 
@@ skipping 57 matching lines @@
   if (address.empty()) {
     LOG(ERROR) << "Failed to find a non-loopback IP_V4 address. Tests will be "
                << "run over the loopback adapter, which may result in hangs.";
     address.assign("127.0.0.1");
   }
 
   return address;
 }
 
 }  // namespace chrome_frame_test