Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Unified Diff: components/arc/arc_bridge_bootstrap.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/arc/BUILD.gn ('k') | components/arc/arc_bridge_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/arc_bridge_bootstrap.cc
diff --git a/components/arc/arc_bridge_bootstrap.cc b/components/arc/arc_bridge_bootstrap.cc
index 204bf7c0780e77a945dc3696a06969fe5350dd9b..50ac911ac2145a3394a48e4a7deeff88c677b6a8 100644
--- a/components/arc/arc_bridge_bootstrap.cc
+++ b/components/arc/arc_bridge_bootstrap.cc
@@ -20,10 +20,10 @@
#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 {
@@ -32,8 +32,6 @@ 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,
@@ -234,10 +232,9 @@ void ArcBridgeBootstrapImpl::OnInstanceConnected(base::ScopedFD fd) {
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));
« no previous file with comments | « components/arc/BUILD.gn ('k') | components/arc/arc_bridge_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698