[mojo] Delete third_party/mojo

ipc/mojo/ipc_channel_mojo.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 "ipc/mojo/ipc_channel_mojo.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message_attachment_set.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/mojo/client_channel.mojom.h"
 #include "ipc/mojo/ipc_mojo_bootstrap.h"
 #include "ipc/mojo/ipc_mojo_handle_attachment.h"
+#include "mojo/edk/embedder/embedder.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 
 #if defined(OS_POSIX) && !defined(OS_NACL)
 #include "ipc/ipc_platform_file_attachment_posix.h"
 #endif
 
 namespace IPC {
 
 namespace {
 
 // TODO(jam): do more tests on using channel on same thread if it supports it (
@@ skipping 28 matching lines @@
   ClientChannelMojo(scoped_refptr<base::TaskRunner> io_runner,
                     const ChannelHandle& handle,
                     Listener* listener)
       : ChannelMojo(io_runner, handle, Channel::MODE_CLIENT, listener),
         binding_(this),
         weak_factory_(this) {
   }
   ~ClientChannelMojo() override {}
 
   // MojoBootstrap::Delegate implementation
-  void OnPipeAvailable(mojo::embedder::ScopedPlatformHandle handle,
+  void OnPipeAvailable(mojo::edk::ScopedPlatformHandle handle,
                        int32_t peer_pid) override {
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) {
-      InitMessageReader(
-          mojo::embedder::CreateChannel(
-              std::move(handle),
-              base::Callback<void(mojo::embedder::ChannelInfo*)>(),
-              scoped_refptr<base::TaskRunner>()),
-          peer_pid);
-      return;
-    }
-    CreateMessagingPipe(
-        std::move(handle),
-        base::Bind(&ClientChannelMojo::BindPipe, weak_factory_.GetWeakPtr()));
+    BindPipe(mojo::edk::CreateMessagePipe(std::move(handle)));
   }
 
   // ClientChannel implementation
   void Init(
       mojo::ScopedMessagePipeHandle pipe,
       int32_t peer_pid,
       const mojo::Callback<void(int32_t)>& callback) override {
     InitMessageReader(std::move(pipe), static_cast<base::ProcessId>(peer_pid));
    callback.Run(GetSelfPID());
   }
@@ skipping 20 matching lines @@
                     const ChannelHandle& handle,
                     Listener* listener)
       : ChannelMojo(io_runner, handle, Channel::MODE_SERVER, listener),
         weak_factory_(this) {
   }
   ~ServerChannelMojo() override {
     Close();
   }
 
   // MojoBootstrap::Delegate implementation
-  void OnPipeAvailable(mojo::embedder::ScopedPlatformHandle handle,
+  void OnPipeAvailable(mojo::edk::ScopedPlatformHandle handle,
                        int32_t peer_pid) override {
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) {
-      message_pipe_ = mojo::embedder::CreateChannel(
-          std::move(handle),
-          base::Callback<void(mojo::embedder::ChannelInfo*)>(),
-          scoped_refptr<base::TaskRunner>());
-      if (!message_pipe_.is_valid()) {
-        LOG(WARNING) << "mojo::CreateMessagePipe failed: ";
-        listener()->OnChannelError();
-        return;
-      }
-      InitMessageReader(std::move(message_pipe_), peer_pid);
-      return;
-    }
-
     mojo::ScopedMessagePipeHandle peer;
     MojoResult create_result =
         mojo::CreateMessagePipe(nullptr, &message_pipe_, &peer);
     if (create_result != MOJO_RESULT_OK) {
       LOG(WARNING) << "mojo::CreateMessagePipe failed: " << create_result;
       listener()->OnChannelError();
       return;
     }
-    CreateMessagingPipe(
-        std::move(handle),
-        base::Bind(&ServerChannelMojo::InitClientChannel,
-                   weak_factory_.GetWeakPtr(), base::Passed(&peer)));
+    InitClientChannel(std::move(peer),
+                      mojo::edk::CreateMessagePipe(std::move(handle)));
   }
   // Channel override
   void Close() override {
     client_channel_.reset();
     message_pipe_.reset();
     ChannelMojo::Close();
   }
 
  private:
   void InitClientChannel(mojo::ScopedMessagePipeHandle peer_handle,
@@ skipping 30 matching lines @@
   return attachment->Owns() ? base::ScopedFD(attachment->TakePlatformFile())
                             : base::ScopedFD(dup(attachment->file()));
 }
 
 #endif
 
 }  // namespace
 
 //------------------------------------------------------------------------------
 
-ChannelMojo::ChannelInfoDeleter::ChannelInfoDeleter(
-    scoped_refptr<base::TaskRunner> io_runner)
-    : io_runner(io_runner) {
-}
-
-ChannelMojo::ChannelInfoDeleter::~ChannelInfoDeleter() {
-}
-
-void ChannelMojo::ChannelInfoDeleter::operator()(
-    mojo::embedder::ChannelInfo* ptr) const {
-  if (base::ThreadTaskRunnerHandle::Get() == io_runner) {
-    mojo::embedder::DestroyChannelOnIOThread(ptr);
-  } else {
-    io_runner->PostTask(
-        FROM_HERE, base::Bind(&mojo::embedder::DestroyChannelOnIOThread, ptr));
-  }
-}
-
-//------------------------------------------------------------------------------
-
 // static
 bool ChannelMojo::ShouldBeUsed() {
   // TODO(rockot): Investigate performance bottlenecks and hopefully reenable
   // this at some point. http://crbug.com/500019
   return false;
 }
 
 // static
 scoped_ptr<ChannelMojo> ChannelMojo::Create(
     scoped_refptr<base::TaskRunner> io_runner,
@@ skipping 29 matching lines @@
       new MojoChannelFactory(io_runner, channel_handle, Channel::MODE_CLIENT));
 }
 
 ChannelMojo::ChannelMojo(scoped_refptr<base::TaskRunner> io_runner,
                          const ChannelHandle& handle,
                          Mode mode,
                          Listener* listener)
     : listener_(listener),
       peer_pid_(base::kNullProcessId),
       io_runner_(io_runner),
-      channel_info_(nullptr, ChannelInfoDeleter(nullptr)),
       waiting_connect_(true),
       weak_factory_(this) {
   // Create MojoBootstrap after all members are set as it touches
   // ChannelMojo from a different thread.
   bootstrap_ = MojoBootstrap::Create(handle, mode, this);
   if (!g_use_channel_on_io_thread_only ||
       io_runner == base::MessageLoop::current()->task_runner()) {
     InitOnIOThread();
   } else {
     io_runner->PostTask(FROM_HERE, base::Bind(&ChannelMojo::InitOnIOThread,
                                               base::Unretained(this)));
   }
 }
 
 ChannelMojo::~ChannelMojo() {
   Close();
 }
 
 void ChannelMojo::InitOnIOThread() {
   ipc_support_.reset(
       new ScopedIPCSupport(base::MessageLoop::current()->task_runner()));
 }
 
-void ChannelMojo::CreateMessagingPipe(
-    mojo::embedder::ScopedPlatformHandle handle,
-    const CreateMessagingPipeCallback& callback) {
-  auto return_callback = base::Bind(&ChannelMojo::OnMessagingPipeCreated,
-                                    weak_factory_.GetWeakPtr(), callback);
-  if (!g_use_channel_on_io_thread_only ||
-      base::ThreadTaskRunnerHandle::Get() == io_runner_) {
-    CreateMessagingPipeOnIOThread(std::move(handle),
-                                  base::ThreadTaskRunnerHandle::Get(),
-                                  return_callback);
-  } else {
-    io_runner_->PostTask(
-        FROM_HERE,
-        base::Bind(&ChannelMojo::CreateMessagingPipeOnIOThread,
-                   base::Passed(&handle), base::ThreadTaskRunnerHandle::Get(),
-                   return_callback));
-  }
-}
-
-// static
-void ChannelMojo::CreateMessagingPipeOnIOThread(
-    mojo::embedder::ScopedPlatformHandle handle,
-    scoped_refptr<base::TaskRunner> callback_runner,
-    const CreateMessagingPipeOnIOThreadCallback& callback) {
-  mojo::embedder::ChannelInfo* channel_info;
-  mojo::ScopedMessagePipeHandle pipe =
-      mojo::embedder::CreateChannelOnIOThread(std::move(handle), &channel_info);
-  if (base::ThreadTaskRunnerHandle::Get() == callback_runner) {
-    callback.Run(std::move(pipe), channel_info);
-  } else {
-    callback_runner->PostTask(
-        FROM_HERE, base::Bind(callback, base::Passed(&pipe), channel_info));
-  }
-}
-
-void ChannelMojo::OnMessagingPipeCreated(
-    const CreateMessagingPipeCallback& callback,
-    mojo::ScopedMessagePipeHandle handle,
-    mojo::embedder::ChannelInfo* channel_info) {
-  DCHECK(!channel_info_.get());
-  channel_info_ = scoped_ptr<mojo::embedder::ChannelInfo, ChannelInfoDeleter>(
-      channel_info, ChannelInfoDeleter(io_runner_));
-  callback.Run(std::move(handle));
-}
-
 bool ChannelMojo::Connect() {
   DCHECK(!message_reader_);
   return bootstrap_->Connect();
 }
 
 void ChannelMojo::Close() {
   scoped_ptr<internal::MessagePipeReader, ReaderDeleter> to_be_deleted;
 
   {
     // |message_reader_| has to be cleared inside the lock,
     // but the instance has to be deleted outside.
     base::AutoLock l(lock_);
     to_be_deleted = std::move(message_reader_);
     // We might Close() before we Connect().
     waiting_connect_ = false;
   }
 
-  channel_info_.reset();
   ipc_support_.reset();
   to_be_deleted.reset();
 }
 
 void ChannelMojo::OnBootstrapError() {
   listener_->OnChannelError();
 }
 
 namespace {
 
@@ skipping 114 matching lines @@
           base::ScopedFD file =
               TakeOrDupFile(static_cast<IPC::internal::PlatformFileAttachment*>(
                   attachment.get()));
           if (!file.is_valid()) {
             DPLOG(WARNING) << "Failed to dup FD to transmit.";
             set->CommitAllDescriptors();
             return MOJO_RESULT_UNKNOWN;
           }
 
           MojoHandle wrapped_handle;
-          MojoResult wrap_result = mojo::embedder::CreatePlatformHandleWrapper(
-              mojo::embedder::ScopedPlatformHandle(
-                  mojo::embedder::PlatformHandle(file.release())),
+          MojoResult wrap_result = mojo::edk::CreatePlatformHandleWrapper(
+              mojo::edk::ScopedPlatformHandle(
+                  mojo::edk::PlatformHandle(file.release())),
               &wrapped_handle);
           if (MOJO_RESULT_OK != wrap_result) {
             LOG(WARNING) << "Pipe failed to wrap handles. Closing: "
                          << wrap_result;
             set->CommitAllDescriptors();
             return wrap_result;
           }
 
           handles->push_back(wrapped_handle);
         }
@@ skipping 33 matching lines @@
     if (!ok) {
       LOG(ERROR) << "Failed to add new Mojo handle.";
       return MOJO_RESULT_UNKNOWN;
     }
   }
 
   return MOJO_RESULT_OK;
 }
 
 }  // namespace IPC