Stop linking in the old Mojo EDK.

components/arc/arc_bridge_bootstrap.cc

 // Copyright 2015 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 "components/arc/arc_bridge_bootstrap.h"
 
 #include <fcntl.h>
 
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/worker_pool.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "ipc/unix_domain_socket_util.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#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/scoped_platform_handle.h"
 
 namespace arc {
 
 namespace {
 
 const base::FilePath::CharType kArcBridgeSocketPath[] =
     FILE_PATH_LITERAL("/var/run/chrome/arc_bridge.sock");
 
-void OnChannelCreated(mojo::embedder::ChannelInfo* channel) {}
-
 class ArcBridgeBootstrapImpl : public ArcBridgeBootstrap {
  public:
   // The possible states of the bootstrap connection.  In the normal flow,
   // the state changes in the following sequence:
   //
   // STOPPED
   //   Start() ->
   // SOCKET_CREATING
   //   CreateSocket() -> OnSocketCreated() ->
   // STARTING
@@ skipping 180 matching lines @@
   return base::ScopedFD(raw_fd);
 }
 
 void ArcBridgeBootstrapImpl::OnInstanceConnected(base::ScopedFD fd) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (state_ != State::STARTED) {
     VLOG(1) << "Stop() called when ARC is not running";
     return;
   }
   SetState(State::READY);
-  mojo::ScopedMessagePipeHandle server_pipe = mojo::embedder::CreateChannel(
-      mojo::embedder::ScopedPlatformHandle(
-          mojo::embedder::PlatformHandle(fd.release())),
-      base::Bind(&OnChannelCreated), base::ThreadTaskRunnerHandle::Get());
+  mojo::ScopedMessagePipeHandle server_pipe = mojo::edk::CreateMessagePipe(
+      mojo::edk::ScopedPlatformHandle(
+          mojo::edk::PlatformHandle(fd.release())));
   ArcBridgeInstancePtr instance;
   instance.Bind(
       mojo::InterfacePtrInfo<ArcBridgeInstance>(std::move(server_pipe), 0u));
   delegate_->OnConnectionEstablished(std::move(instance));
 }
 
 void ArcBridgeBootstrapImpl::Stop() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (state_ == State::STOPPED || state_ == State::STOPPING) {
     VLOG(1) << "Stop() called when ARC is not running";
@@ skipping 34 matching lines @@
 
 ArcBridgeBootstrap::ArcBridgeBootstrap() {}
 ArcBridgeBootstrap::~ArcBridgeBootstrap() {}
 
 // static
 scoped_ptr<ArcBridgeBootstrap> ArcBridgeBootstrap::Create() {
   return make_scoped_ptr(new ArcBridgeBootstrapImpl());
 }
 
 }  // namespace arc