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

Side by Side Diff: services/service_manager/tests/util.cc

Issue 2738853002: Connections now take a ConnectionParams instead of a pipe handle. (Closed)
Patch Set: Fix Win release build. Created 3 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
« no previous file with comments | « services/service_manager/tests/service_manager/service_manager_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "services/service_manager/tests/util.h" 5 #include "services/service_manager/tests/util.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 base::LaunchOptions options; 83 base::LaunchOptions options;
84 #if defined(OS_WIN) 84 #if defined(OS_WIN)
85 options.handles_to_inherit = &handle_passing_info; 85 options.handles_to_inherit = &handle_passing_info;
86 #elif defined(OS_POSIX) 86 #elif defined(OS_POSIX)
87 options.fds_to_remap = &handle_passing_info; 87 options.fds_to_remap = &handle_passing_info;
88 #endif 88 #endif
89 *process = base::LaunchProcess(child_command_line, options); 89 *process = base::LaunchProcess(child_command_line, options);
90 DCHECK(process->IsValid()); 90 DCHECK(process->IsValid());
91 receiver->SetPID(process->Pid()); 91 receiver->SetPID(process->Pid());
92 pending_process.Connect(process->Handle(), 92 pending_process.Connect(
93 platform_channel_pair.PassServerHandle()); 93 process->Handle(),
94 mojo::edk::ConnectionParams(platform_channel_pair.PassServerHandle()));
94 return connection; 95 return connection;
95 } 96 }
96 97
97 } // namespace test 98 } // namespace test
98 } // namespace service_manager 99 } // namespace service_manager
OLDNEW
« no previous file with comments | « services/service_manager/tests/service_manager/service_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698