Index: chrome_frame/test/chrome_frame_test_utils.cc |
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc |
index c614214923143dc1eab2a4dcfb145f6694e2969d..6c7fb4896076c9f5c870a25ad7f73425604a71ce 100644 |
--- a/chrome_frame/test/chrome_frame_test_utils.cc |
+++ b/chrome_frame/test/chrome_frame_test_utils.cc |
@@ -640,7 +640,7 @@ |
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 @@ |
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 @@ |
// 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; |
} |