summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/disk_cache/stress_cache.cc4
-rw-r--r--net/test/test_server_posix.cc3
-rw-r--r--net/tools/crash_cache/crash_cache.cc4
-rw-r--r--net/tools/dump_cache/dump_cache.cc2
4 files changed, 4 insertions, 9 deletions
diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc
index f9c8b62..0cd8f43 100644
--- a/net/disk_cache/stress_cache.cc
+++ b/net/disk_cache/stress_cache.cc
@@ -59,9 +59,7 @@ int RunSlave(int iteration) {
cmdline.AppendArg(base::IntToString(iteration));
base::ProcessHandle handle;
- base::LaunchOptions options;
- options.process_handle = &handle;
- if (!base::LaunchProcess(cmdline, options)) {
+ if (!base::LaunchProcess(cmdline, base::LaunchOptions(), &handle)) {
printf("Unable to run test\n");
return kError;
}
diff --git a/net/test/test_server_posix.cc b/net/test/test_server_posix.cc
index a3abc69..3455694 100644
--- a/net/test/test_server_posix.cc
+++ b/net/test/test_server_posix.cc
@@ -124,8 +124,7 @@ bool TestServer::LaunchPython(const FilePath& testserver_path) {
// Launch a new testserver process.
base::LaunchOptions options;
options.fds_to_remap = &map_write_fd;
- options.process_handle = &process_handle_;
- if (!base::LaunchProcess(python_command, options)) {
+ if (!base::LaunchProcess(python_command, options, &process_handle_)) {
LOG(ERROR) << "Failed to launch " << python_command.command_line_string();
return false;
}
diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc
index 637daae..f1b4b79 100644
--- a/net/tools/crash_cache/crash_cache.cc
+++ b/net/tools/crash_cache/crash_cache.cc
@@ -49,9 +49,7 @@ int RunSlave(RankCrashes action) {
cmdline.AppendArg(base::IntToString(action));
base::ProcessHandle handle;
- base::LaunchOptions options;
- options.process_handle = &handle;
- if (!base::LaunchProcess(cmdline, options)) {
+ if (!base::LaunchProcess(cmdline, base::LaunchOptions(), &handle)) {
printf("Unable to run test %d\n", action);
return GENERIC;
}
diff --git a/net/tools/dump_cache/dump_cache.cc b/net/tools/dump_cache/dump_cache.cc
index 4a63d00..ee5a50e 100644
--- a/net/tools/dump_cache/dump_cache.cc
+++ b/net/tools/dump_cache/dump_cache.cc
@@ -97,7 +97,7 @@ int LaunchSlave(const CommandLine& command_line,
// TODO(evanm): remove needless usage of wstring from here and elsewhere.
new_command_line.AppendSwitchASCII(kPipe, WideToASCII(pipe_number));
- if (!base::LaunchProcess(new_command_line, base::LaunchOptions())) {
+ if (!base::LaunchProcess(new_command_line, base::LaunchOptions(), NULL)) {
printf("Unable to launch the needed version of this tool: %ls\n",
new_program.c_str());
printf(kUpgradeHelp);