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

Side by Side Diff: chrome/browser/extensions/api/messaging/native_process_launcher_win.cc

Issue 999033003: Remove uses of KillProcess() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/messaging/native_process_launcher.h" 5 #include "chrome/browser/extensions/api/messaging/native_process_launcher.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/process/kill.h"
12 #include "base/process/launch.h" 11 #include "base/process/launch.h"
12 #include "base/process/process.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/win/registry.h" 17 #include "base/win/registry.h"
18 #include "base/win/scoped_handle.h" 18 #include "base/win/scoped_handle.h"
19 #include "crypto/random.h" 19 #include "crypto/random.h"
20 20
21 namespace extensions { 21 namespace extensions {
22 22
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 LOG(ERROR) << "Error launching process " 156 LOG(ERROR) << "Error launching process "
157 << command_line.GetProgram().MaybeAsASCII(); 157 << command_line.GetProgram().MaybeAsASCII();
158 return false; 158 return false;
159 } 159 }
160 160
161 bool stdout_connected = ConnectNamedPipe(stdout_pipe.Get(), NULL) ? 161 bool stdout_connected = ConnectNamedPipe(stdout_pipe.Get(), NULL) ?
162 TRUE : GetLastError() == ERROR_PIPE_CONNECTED; 162 TRUE : GetLastError() == ERROR_PIPE_CONNECTED;
163 bool stdin_connected = ConnectNamedPipe(stdin_pipe.Get(), NULL) ? 163 bool stdin_connected = ConnectNamedPipe(stdin_pipe.Get(), NULL) ?
164 TRUE : GetLastError() == ERROR_PIPE_CONNECTED; 164 TRUE : GetLastError() == ERROR_PIPE_CONNECTED;
165 if (!stdout_connected || !stdin_connected) { 165 if (!stdout_connected || !stdin_connected) {
166 base::KillProcess(cmd_process.Handle(), 0, false); 166 cmd_process.Terminate(0, false);
167 LOG(ERROR) << "Failed to connect IO pipes when starting " 167 LOG(ERROR) << "Failed to connect IO pipes when starting "
168 << command_line.GetProgram().MaybeAsASCII(); 168 << command_line.GetProgram().MaybeAsASCII();
169 return false; 169 return false;
170 } 170 }
171 171
172 *process = cmd_process.Pass(); 172 *process = cmd_process.Pass();
173 *read_file = base::File(stdout_pipe.Take()); 173 *read_file = base::File(stdout_pipe.Take());
174 *write_file = base::File(stdin_pipe.Take()); 174 *write_file = base::File(stdin_pipe.Take());
175 175
176 return true; 176 return true;
177 } 177 }
178 178
179 } // namespace extensions 179 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/lifetime/application_lifetime.cc » ('j') | chrome/browser/process_singleton_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698