Stop linking in the old Mojo EDK.

mojo/runner/host/child_process_host.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/runner/host/child_process_host.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
+#include "mojo/edk/embedder/embedder.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/runner/host/switches.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
 #include "sandbox/linux/services/namespace_sandbox.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace mojo {
 namespace runner {
 
 ChildProcessHost::ChildProcessHost(base::TaskRunner* launch_process_runner,
                                    bool start_sandboxed,
                                    const base::FilePath& app_path)
     : launch_process_runner_(launch_process_runner),
       start_sandboxed_(start_sandboxed),
       app_path_(app_path),
-      channel_info_(nullptr),
       start_child_process_event_(false, false),
       weak_factory_(this) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk"))
-    serializer_platform_channel_pair_.reset(new edk::PlatformChannelPair(true));
+  serializer_platform_channel_pair_.reset(new edk::PlatformChannelPair(true));
 
-  child_message_pipe_ = embedder::CreateChannel(
-      platform_channel_pair_.PassServerHandle(),
-      base::Bind(&ChildProcessHost::DidCreateChannel, base::Unretained(this)),
-      base::ThreadTaskRunnerHandle::Get());
+  child_message_pipe_ = edk::CreateMessagePipe(
+      platform_channel_pair_.PassServerHandle());
 }
 
 ChildProcessHost::ChildProcessHost(ScopedHandle channel)
     : launch_process_runner_(nullptr),
       start_sandboxed_(false),
-      channel_info_(nullptr),
       start_child_process_event_(false, false),
       weak_factory_(this) {
   CHECK(channel.is_valid());
   ScopedMessagePipeHandle handle(MessagePipeHandle(channel.release().value()));
   controller_.Bind(InterfacePtrInfo<ChildController>(std::move(handle), 0u));
 }
 
 ChildProcessHost::~ChildProcessHost() {
   if (!app_path_.empty())
     CHECK(!controller_) << "Destroying ChildProcessHost before calling Join";
 }
 
 void ChildProcessHost::Start(
     const base::Callback<void(base::ProcessId)>& pid_available_callback) {
   DCHECK(!child_process_.IsValid());
   DCHECK(child_message_pipe_.is_valid());
 
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) {
-    std::string client_handle_as_string =
-        serializer_platform_channel_pair_
-            ->PrepareToPassClientHandleToChildProcessAsString(
-                &handle_passing_info_);
-    // We can't send the MP for the token serializer implementation as a
-    // platform handle, because that would require the other side to use the
-    // token initializer itself! So instead we send it as a string.
-    MojoResult rv = MojoWriteMessage(
-        child_message_pipe_.get().value(), client_handle_as_string.c_str(),
-        static_cast<uint32_t>(client_handle_as_string.size()), nullptr, 0,
-        MOJO_WRITE_MESSAGE_FLAG_NONE);
-    DCHECK_EQ(rv, MOJO_RESULT_OK);
-  }
+  std::string client_handle_as_string =
+      serializer_platform_channel_pair_
+          ->PrepareToPassClientHandleToChildProcessAsString(
+              &handle_passing_info_);
+  // We can't send the MP for the token serializer implementation as a
+  // platform handle, because that would require the other side to use the
+  // token initializer itself! So instead we send it as a string.
+  MojoResult rv = MojoWriteMessage(
+      child_message_pipe_.get().value(), client_handle_as_string.c_str(),
+      static_cast<uint32_t>(client_handle_as_string.size()), nullptr, 0,
+      MOJO_WRITE_MESSAGE_FLAG_NONE);
+  DCHECK_EQ(rv, MOJO_RESULT_OK);
 
   controller_.Bind(
       InterfacePtrInfo<ChildController>(std::move(child_message_pipe_), 0u));
 
   launch_process_runner_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&ChildProcessHost::DoLaunch, base::Unretained(this)),
       base::Bind(&ChildProcessHost::DidStart, weak_factory_.GetWeakPtr(),
                  pid_available_callback));
 }
@@ skipping 105 matching lines @@
                  << " support.";
     }
   } else
 #endif
     child_process_ = base::LaunchProcess(child_command_line, options);
 
   if (child_process_.IsValid()) {
     platform_channel_pair_.ChildProcessLaunched();
     if (serializer_platform_channel_pair_.get()) {
       serializer_platform_channel_pair_->ChildProcessLaunched();
-      mojo::embedder::ChildProcessLaunched(
+      mojo::edk::ChildProcessLaunched(
           child_process_.Handle(),
-          mojo::embedder::ScopedPlatformHandle(mojo::embedder::PlatformHandle(
-              serializer_platform_channel_pair_->PassServerHandle().release().
-                  handle)));
+          serializer_platform_channel_pair_->PassServerHandle());
     }
   }
   start_child_process_event_.Signal();
 }
 
 void ChildProcessHost::AppCompleted(int32_t result) {
   if (!on_app_complete_.is_null()) {
     auto on_app_complete = on_app_complete_;
     on_app_complete_.reset();
     on_app_complete.Run(result);
   }
 }
 
-void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) {
-  DVLOG(2) << "AppChildProcessHost::DidCreateChannel()";
-
-  DCHECK(channel_info ||
-         base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk"));
-  channel_info_ = channel_info;
-}
-
 }  // namespace runner
 }  // namespace mojo