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

Unified Diff: mojo/embedder/embedder.cc

Issue 591573002: Mojo: Remove Channel::AttachMessagePipeEndpoint(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | mojo/system/channel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/embedder/embedder.cc
diff --git a/mojo/embedder/embedder.cc b/mojo/embedder/embedder.cc
index 1f94d596c61a74a98d2b8e249d88129331404391..5b2478ab0dd503f3751dfd0623df98d9bb2d4f83 100644
--- a/mojo/embedder/embedder.cc
+++ b/mojo/embedder/embedder.cc
@@ -10,6 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/embedder/platform_support.h"
#include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
#include "mojo/system/core.h"
#include "mojo/system/entrypoints.h"
#include "mojo/system/message_in_transit.h"
@@ -58,12 +59,12 @@ scoped_refptr<system::Channel> MakeChannel(
// |Shutdown()| will have to be called on it).
// Attach the message pipe endpoint.
- system::MessageInTransit::EndpointId endpoint_id =
- channel->AttachMessagePipeEndpoint(message_pipe, 1);
+ system::MessageInTransit::EndpointId endpoint_id = channel->AttachEndpoint(
+ make_scoped_refptr(new system::ChannelEndpoint(message_pipe.get(), 1)));
if (endpoint_id == system::MessageInTransit::kInvalidEndpointId) {
// This means that, e.g., the other endpoint of the message pipe was closed
// first. But it's not necessarily an error per se.
- DVLOG(2) << "Channel::AttachMessagePipeEndpoint() failed";
+ DVLOG(2) << "Channel::AttachEndpoint() failed";
return channel;
}
CHECK_EQ(endpoint_id, system::Channel::kBootstrapEndpointId);
« no previous file with comments | « no previous file | mojo/system/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698