Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Unified Diff: chrome_frame/test_utils.cc

Issue 71013004: Base: Remove Receive() from ScopedHandle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix delegate_execute for google_chrome_build Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/chrome_frame_test_utils.cc ('k') | cloud_print/service/win/chrome_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test_utils.cc
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index ef780468f44d4e7d156c08f7a310442e1ef0e3a1..b8884e7aea9e97611ff571ce24bf3f7a378dc473 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::ProcessHandle process_handle = INVALID_HANDLE_VALUE;
+ base::win::ScopedHandle process_handle;
int exit_code = -1;
if (registration_type == PER_USER)
@@ -111,13 +111,12 @@ 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, &exit_code,
+ process_handle.Get(), &exit_code,
base::TimeDelta::FromMilliseconds(kDllRegistrationTimeoutMs))) {
LOG(ERROR) << "Timeout waiting to register or unregister DLL with "
"command: " << registration_command;
- base::KillProcess(process_handle, 0, false);
+ base::KillProcess(process_handle.Get(), 0, false);
NOTREACHED() << "Aborting test due to registration failure.";
}
}
« no previous file with comments | « chrome_frame/test/chrome_frame_test_utils.cc ('k') | cloud_print/service/win/chrome_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698