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

Unified Diff: mojo/edk/system/channel_unittest.cc

Issue 799113004: Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add mojo's ply to checklicenses whitelist Created 6 years 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 | « mojo/edk/system/channel.cc ('k') | mojo/edk/system/incoming_endpoint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/channel_unittest.cc
diff --git a/mojo/edk/system/channel_unittest.cc b/mojo/edk/system/channel_unittest.cc
index ce4eefe4b28d80eccd7811ac94ac8fffe3fbba5e..741c99ff2541caec09a214627d89fe8553de9406 100644
--- a/mojo/edk/system/channel_unittest.cc
+++ b/mojo/edk/system/channel_unittest.cc
@@ -199,7 +199,7 @@ TEST_F(ChannelTest, CloseBeforeRun) {
mp->Close(0);
- channel()->AttachAndRunEndpoint(channel_endpoint, true);
+ channel()->SetBootstrapEndpoint(channel_endpoint);
io_thread()->PostTaskAndWait(
FROM_HERE, base::Bind(&ChannelTest::ShutdownChannelOnIOThread,
@@ -225,7 +225,7 @@ TEST_F(ChannelTest, ShutdownAfterAttach) {
scoped_refptr<MessagePipe> mp(
MessagePipe::CreateLocalProxy(&channel_endpoint));
- channel()->AttachAndRunEndpoint(channel_endpoint, true);
+ channel()->SetBootstrapEndpoint(channel_endpoint);
Waiter waiter;
waiter.Init();
@@ -268,7 +268,7 @@ TEST_F(ChannelTest, WaitAfterAttachRunAndShutdown) {
scoped_refptr<MessagePipe> mp(
MessagePipe::CreateLocalProxy(&channel_endpoint));
- channel()->AttachAndRunEndpoint(channel_endpoint, true);
+ channel()->SetBootstrapEndpoint(channel_endpoint);
io_thread()->PostTaskAndWait(
FROM_HERE, base::Bind(&ChannelTest::ShutdownChannelOnIOThread,
« no previous file with comments | « mojo/edk/system/channel.cc ('k') | mojo/edk/system/incoming_endpoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698