Index: mojo/shell/runner/host/child_process_host.h |
diff --git a/mojo/shell/runner/host/child_process_host.h b/mojo/shell/runner/host/child_process_host.h |
index 7472096a898b3b413fc4f0d4189fc14e34a195db..7dfe3f104d6bc727cd681b413dc4d3bfefebde8a 100644 |
--- a/mojo/shell/runner/host/child_process_host.h |
+++ b/mojo/shell/runner/host/child_process_host.h |
@@ -21,9 +21,6 @@ |
#include "mojo/public/cpp/system/message_pipe.h" |
#include "mojo/shell/runner/child/child_controller.mojom.h" |
#include "mojo/shell/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; |
@@ -101,9 +98,6 @@ class ChildProcessHost { |
void AppCompleted(int32_t result); |
- // Callback for |embedder::CreateChannel()|. |
- void DidCreateChannel(embedder::ChannelInfo* channel_info); |
- |
// Called once |pipe_holder_| is bound to a pipe. |
void OnMessagePipeCreated(); |
@@ -127,14 +121,12 @@ class ChildProcessHost { |
const base::FilePath app_path_; |
base::Process child_process_; |
// Used for the ChildController binding. |
- embedder::PlatformChannelPair platform_channel_pair_; |
+ edk::PlatformChannelPair platform_channel_pair_; |
mojom::ChildControllerPtr controller_; |
- embedder::ChannelInfo* channel_info_; |
mojom::ChildController::StartAppCallback on_app_complete_; |
- embedder::HandlePassingInformation handle_passing_info_; |
+ edk::HandlePassingInformation handle_passing_info_; |
- // Used only when --use-new-edk is specified. Used to back the NodeChannel |
- // between the parent and child node. |
+ // Used to back the NodeChannel between the parent and child node. |
scoped_ptr<edk::PlatformChannelPair> node_channel_; |
// Since Start() calls a method on another thread, we use an event to block |