OLD | NEW |
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 std::string child_token = mojo::edk::GenerateRandomToken(); | 68 std::string child_token = mojo::edk::GenerateRandomToken(); |
69 mojo::ScopedMessagePipeHandle pipe = | 69 mojo::ScopedMessagePipeHandle pipe = |
70 mojo::edk::CreateParentMessagePipe(primordial_pipe_token, child_token); | 70 mojo::edk::CreateParentMessagePipe(primordial_pipe_token, child_token); |
71 | 71 |
72 service_manager::mojom::ServicePtr client; | 72 service_manager::mojom::ServicePtr client; |
73 client.Bind(mojo::InterfacePtrInfo<service_manager::mojom::Service>( | 73 client.Bind(mojo::InterfacePtrInfo<service_manager::mojom::Service>( |
74 std::move(pipe), 0u)); | 74 std::move(pipe), 0u)); |
75 service_manager::mojom::PIDReceiverPtr receiver; | 75 service_manager::mojom::PIDReceiverPtr receiver; |
76 | 76 |
77 service_manager::Connector::ConnectParams params(target); | 77 service_manager::Connector::ConnectParams params(target); |
78 params.set_client_process_connection(std::move(client), GetProxy(&receiver)); | 78 params.set_client_process_connection(std::move(client), |
| 79 MakeRequest(&receiver)); |
79 std::unique_ptr<service_manager::Connection> connection = | 80 std::unique_ptr<service_manager::Connection> connection = |
80 connector->Connect(¶ms); | 81 connector->Connect(¶ms); |
81 { | 82 { |
82 base::RunLoop loop; | 83 base::RunLoop loop; |
83 connection->AddConnectionCompletedClosure(base::Bind(&QuitLoop, &loop)); | 84 connection->AddConnectionCompletedClosure(base::Bind(&QuitLoop, &loop)); |
84 base::MessageLoop::ScopedNestableTaskAllower allow( | 85 base::MessageLoop::ScopedNestableTaskAllower allow( |
85 base::MessageLoop::current()); | 86 base::MessageLoop::current()); |
86 loop.Run(); | 87 loop.Run(); |
87 } | 88 } |
88 | 89 |
89 base::LaunchOptions options; | 90 base::LaunchOptions options; |
90 #if defined(OS_WIN) | 91 #if defined(OS_WIN) |
91 options.handles_to_inherit = &handle_passing_info; | 92 options.handles_to_inherit = &handle_passing_info; |
92 #elif defined(OS_POSIX) | 93 #elif defined(OS_POSIX) |
93 options.fds_to_remap = &handle_passing_info; | 94 options.fds_to_remap = &handle_passing_info; |
94 #endif | 95 #endif |
95 *process = base::LaunchProcess(child_command_line, options); | 96 *process = base::LaunchProcess(child_command_line, options); |
96 DCHECK(process->IsValid()); | 97 DCHECK(process->IsValid()); |
97 receiver->SetPID(process->Pid()); | 98 receiver->SetPID(process->Pid()); |
98 mojo::edk::ChildProcessLaunched(process->Handle(), | 99 mojo::edk::ChildProcessLaunched(process->Handle(), |
99 platform_channel_pair.PassServerHandle(), | 100 platform_channel_pair.PassServerHandle(), |
100 child_token); | 101 child_token); |
101 return connection; | 102 return connection; |
102 } | 103 } |
103 | 104 |
104 } // namespace test | 105 } // namespace test |
105 } // namespace service_manager | 106 } // namespace service_manager |
OLD | NEW |