| Index: mojo/runner/host/child_process_host.h
|
| diff --git a/mojo/runner/host/child_process_host.h b/mojo/runner/host/child_process_host.h
|
| index dc260876f934499d41429d09e4111ba306a11022..0576342cf422f0dee47d95df8473956d612ae0a2 100644
|
| --- a/mojo/runner/host/child_process_host.h
|
| +++ b/mojo/runner/host/child_process_host.h
|
| @@ -13,12 +13,10 @@
|
| #include "base/process/process.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "mojo/edk/embedder/platform_channel_pair.h"
|
| +#include "mojo/edk/embedder/scoped_platform_handle.h"
|
| #include "mojo/public/cpp/system/message_pipe.h"
|
| #include "mojo/runner/child/child_controller.mojom.h"
|
| #include "mojo/runner/host/child_process_host.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
|
|
|
| namespace base {
|
| class TaskRunner;
|
| @@ -73,22 +71,17 @@ class ChildProcessHost {
|
|
|
| void AppCompleted(int32_t result);
|
|
|
| - // Callback for |embedder::CreateChannel()|.
|
| - void DidCreateChannel(embedder::ChannelInfo* channel_info);
|
| -
|
| scoped_refptr<base::TaskRunner> launch_process_runner_;
|
| bool start_sandboxed_;
|
| const base::FilePath app_path_;
|
| base::Process child_process_;
|
| // Used for the ChildController binding.
|
| - embedder::PlatformChannelPair platform_channel_pair_;
|
| + edk::PlatformChannelPair platform_channel_pair_;
|
| ChildControllerPtr controller_;
|
| - embedder::ChannelInfo* channel_info_;
|
| ChildController::StartAppCallback on_app_complete_;
|
| - embedder::HandlePassingInformation handle_passing_info_;
|
| + edk::HandlePassingInformation handle_passing_info_;
|
|
|
| - // Used only when --use-new-edk is specified, as a communication channel for
|
| - // Broker.
|
| + // Used as a communication channel for Broker.
|
| scoped_ptr<edk::PlatformChannelPair> serializer_platform_channel_pair_;
|
|
|
| // Since Start() calls a method on another thread, we use an event to block
|
|
|