Add a Mojo EDK for Chrome that uses one OS pipe per message pipe.

mojo/runner/child_process.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/child_process.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/process_delegate.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/runner/child_process.mojom.h"
 #include "mojo/runner/native_application_support.h"
 #include "mojo/runner/switches.h"
 
+#if defined(USE_CHROME_EDK)
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/edk/embedder/process_delegate.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/edk/embedder/simple_platform_support.h"
+#else
+#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
+#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
+#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
+#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
+#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h"
+#endif
+
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
 #include "base/rand_util.h"
 #include "base/sys_info.h"
 #include "mojo/runner/linux_sandbox.h"
 #endif
 
 namespace mojo {
 namespace runner {
 
 namespace {
@@ skipping 40 matching lines @@
   base::Closure run_after_;
 
   DISALLOW_COPY_AND_ASSIGN(Blocker);
 };
 
 // AppContext ------------------------------------------------------------------
 
 class ChildControllerImpl;
 
 // Should be created and initialized on the main thread.
+#if defined(USE_CHROME_EDK)
+class AppContext : public edk::ProcessDelegate {
+#else
 class AppContext : public embedder::ProcessDelegate {
+#endif
  public:
   AppContext()
       : io_thread_("io_thread"), controller_thread_("controller_thread") {}
   ~AppContext() override {}
 
   void Init() {
     // Initialize Mojo before starting any threads.
+#if defined(USE_CHROME_EDK)
+    edk::Init(make_scoped_ptr(new edk::SimplePlatformSupport()));
+#else
     embedder::Init(make_scoped_ptr(new embedder::SimplePlatformSupport()));
+#endif
 
     // Create and start our I/O thread.
     base::Thread::Options io_thread_options(base::MessageLoop::TYPE_IO, 0);
     CHECK(io_thread_.StartWithOptions(io_thread_options));
     io_runner_ = io_thread_.task_runner().get();
     CHECK(io_runner_.get());
 
     // Create and start our controller thread.
     base::Thread::Options controller_thread_options;
     controller_thread_options.message_loop_type =
         base::MessageLoop::TYPE_CUSTOM;
     controller_thread_options.message_pump_factory =
         base::Bind(&common::MessagePumpMojo::Create);
     CHECK(controller_thread_.StartWithOptions(controller_thread_options));
     controller_runner_ = controller_thread_.task_runner().get();
     CHECK(controller_runner_.get());
 
+#if defined(USE_CHROME_EDK)
+    edk::InitIPCSupport(controller_runner_, this, io_runner_,
+                        edk::ScopedPlatformHandle());
+#else
     // TODO(vtl): This should be SLAVE, not NONE.
     embedder::InitIPCSupport(embedder::ProcessType::NONE, controller_runner_,
                              this, io_runner_,
                              embedder::ScopedPlatformHandle());
+#endif
   }
 
   void Shutdown() {
     Blocker blocker;
     shutdown_unblocker_ = blocker.GetUnblocker();
     controller_runner_->PostTask(
         FROM_HERE, base::Bind(&AppContext::ShutdownOnControllerThread,
                               base::Unretained(this)));
     blocker.Block();
   }
 
   base::SingleThreadTaskRunner* io_runner() const { return io_runner_.get(); }
 
   base::SingleThreadTaskRunner* controller_runner() const {
     return controller_runner_.get();
   }
 
   ChildControllerImpl* controller() const { return controller_.get(); }
 
   void set_controller(scoped_ptr<ChildControllerImpl> controller) {
     controller_ = controller.Pass();
   }
 
  private:
   void ShutdownOnControllerThread() {
     // First, destroy the controller.
     controller_.reset();
 
     // Next shutdown IPC. We'll unblock the main thread in OnShutdownComplete().
+#if defined(USE_CHROME_EDK)
+    edk::ShutdownIPCSupport();
+#else
     embedder::ShutdownIPCSupport();
+#endif
   }
 
   // ProcessDelegate implementation.
   void OnShutdownComplete() override {
     shutdown_unblocker_.Unblock(base::Closure());
   }
 
   base::Thread io_thread_;
   scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
 
@@ skipping 17 matching lines @@
     DCHECK(thread_checker_.CalledOnValidThread());
 
     // TODO(vtl): Pass in the result from |MainMain()|.
     on_app_complete_.Run(MOJO_RESULT_UNIMPLEMENTED);
   }
 
   // To be executed on the controller thread. Creates the |ChildController|,
   // etc.
   static void Init(AppContext* app_context,
                    base::NativeLibrary app_library,
+#if defined(USE_CHROME_EDK)
+                   edk::ScopedPlatformHandle platform_channel,
+#else
                    embedder::ScopedPlatformHandle platform_channel,
+#endif
                    const Blocker::Unblocker& unblocker) {
     DCHECK(app_context);
     DCHECK(platform_channel.is_valid());
 
     DCHECK(!app_context->controller());
 
     scoped_ptr<ChildControllerImpl> impl(
         new ChildControllerImpl(app_context, app_library, unblocker));
 
+#if defined(USE_CHROME_EDK)
+    ScopedMessagePipeHandle host_message_pipe(
+        edk::CreateMessagePipe(platform_channel.Pass()));
+#else
     ScopedMessagePipeHandle host_message_pipe(embedder::CreateChannel(
         platform_channel.Pass(),
         base::Bind(&ChildControllerImpl::DidCreateChannel,
                    base::Unretained(impl.get())),
         base::ThreadTaskRunnerHandle::Get()));
+#endif
 
     impl->Bind(host_message_pipe.Pass());
 
     app_context->set_controller(impl.Pass());
   }
 
   void Bind(ScopedMessagePipeHandle handle) { binding_.Bind(handle.Pass()); }
 
   void OnConnectionError() {
     // A connection error means the connection to the shell is lost. This is not
@@ skipping 18 matching lines @@
     _exit(exit_code);
   }
 
  private:
   ChildControllerImpl(AppContext* app_context,
                       base::NativeLibrary app_library,
                       const Blocker::Unblocker& unblocker)
       : app_context_(app_context),
         app_library_(app_library),
         unblocker_(unblocker),
+#if !defined(USE_CHROME_EDK)
         channel_info_(nullptr),
+#endif
         binding_(this) {
     binding_.set_connection_error_handler([this]() { OnConnectionError(); });
   }
 
+#if !defined(USE_CHROME_EDK)
   // Callback for |embedder::CreateChannel()|.
   void DidCreateChannel(embedder::ChannelInfo* channel_info) {
     DVLOG(2) << "ChildControllerImpl::DidCreateChannel()";
     DCHECK(thread_checker_.CalledOnValidThread());
     channel_info_ = channel_info;
   }
+#endif
 
   static void StartAppOnMainThread(
       base::NativeLibrary app_library,
       InterfaceRequest<Application> application_request) {
     if (!RunNativeApplication(app_library, application_request.Pass())) {
       LOG(ERROR) << "Failure to RunNativeApplication()";
     }
   }
 
   base::ThreadChecker thread_checker_;
   AppContext* const app_context_;
   base::NativeLibrary app_library_;
   Blocker::Unblocker unblocker_;
   StartAppCallback on_app_complete_;
 
+#if !defined(USE_CHROME_EDK)
   embedder::ChannelInfo* channel_info_;
+#endif
   Binding<ChildController> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildControllerImpl);
 };
 
 }  // namespace
 
 int ChildProcessMain() {
   DVLOG(2) << "ChildProcessMain()";
   const base::CommandLine& command_line =
@@ skipping 34 matching lines @@
           BrokerFilePermission::ReadWriteCreateUnlinkRecursive("/dev/shm/"));
       sandbox.reset(new mandoline::LinuxSandbox(permissions));
       sandbox->Warmup();
       sandbox->EngageNamespaceSandbox();
       sandbox->EngageSeccompSandbox();
       sandbox->Seal();
     }
 #endif
   }
 
+#if defined(USE_CHROME_EDK)
+  edk::ScopedPlatformHandle platform_channel =
+      edk::PlatformChannelPair::PassClientHandleFromParentProcess(
+          command_line);
+#else
   embedder::ScopedPlatformHandle platform_channel =
       embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
           command_line);
+#endif
   CHECK(platform_channel.is_valid());
 
   DCHECK(!base::MessageLoop::current());
 
   AppContext app_context;
   app_context.Init();
 
   Blocker blocker;
   app_context.controller_runner()->PostTask(
       FROM_HERE,
       base::Bind(&ChildControllerImpl::Init, base::Unretained(&app_context),
                  base::Unretained(app_library), base::Passed(&platform_channel),
                  blocker.GetUnblocker()));
   // This will block, then run whatever the controller wants.
   blocker.Block();
 
   app_context.Shutdown();
 
   return 0;
 }
 
 }  // namespace runner
 }  // namespace mojo