| Index: base/process/process_win.cc
|
| diff --git a/base/process/process_win.cc b/base/process/process_win.cc
|
| index b62fdb4f8c38f55acb1696097813065dfe735a2c..6097bcb790fae0f5441c839665a2e16b21b46743 100644
|
| --- a/base/process/process_win.cc
|
| +++ b/base/process/process_win.cc
|
| @@ -123,17 +123,10 @@ void Process::Close() {
|
| process_.Close();
|
| }
|
|
|
| -void Process::Terminate(int result_code) {
|
| +bool Process::Terminate(int result_code, bool wait) {
|
| DCHECK(IsValid());
|
| -
|
| - // Call NtTerminateProcess directly, without going through the import table,
|
| - // which might have been hooked with a buggy replacement by third party
|
| - // software. http://crbug.com/81449.
|
| - HMODULE module = GetModuleHandle(L"ntdll.dll");
|
| - typedef UINT (WINAPI *TerminateProcessPtr)(HANDLE handle, UINT code);
|
| - TerminateProcessPtr terminate_process = reinterpret_cast<TerminateProcessPtr>(
|
| - GetProcAddress(module, "NtTerminateProcess"));
|
| - terminate_process(Handle(), result_code);
|
| + // TODO(rvargas) crbug/417532: Move the implementation here.
|
| + return KillProcess(Handle(), result_code, wait);
|
| }
|
|
|
| bool Process::WaitForExit(int* exit_code) {
|
|
|