third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc - Issue 890843003: Revert of Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc

Issue 890843003: Revert of Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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 | « third_party/mojo/src/mojo/edk/system/channel_manager.cc ('k') | third_party/mojo/src/mojo/edk/system/connection_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc

diff --git a/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc b/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc

index 86ab4a0adf1274fb762bfe395d2897008b989cf8..c5aa503789c747f5daabaf630f97499124bb8b88 100644

--- a/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc

+++ b/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc

@@ -48,9 +48,12 @@

embedder::PlatformChannelPair channel_pair;

+ scoped_refptr<ChannelEndpoint> cep;

+ scoped_refptr<MessagePipeDispatcher> d =

+ MessagePipeDispatcher::CreateRemoteMessagePipe(&cep);

const ChannelId id = 1;

- scoped_refptr<MessagePipeDispatcher> d =

- cm.CreateChannelOnIOThread(id, channel_pair.PassServerHandle());

+ cm.CreateChannelOnIOThread(id, channel_pair.PassServerHandle(), cep);

+ cep = nullptr;

scoped_refptr<Channel> ch = cm.GetChannel(id);

EXPECT_TRUE(ch);

@@ -74,13 +77,19 @@

embedder::PlatformChannelPair channel_pair;

+ scoped_refptr<ChannelEndpoint> cep1;

+ scoped_refptr<MessagePipeDispatcher> d1 =

+ MessagePipeDispatcher::CreateRemoteMessagePipe(&cep1);

const ChannelId id1 = 1;

- scoped_refptr<MessagePipeDispatcher> d1 =

- cm.CreateChannelOnIOThread(id1, channel_pair.PassServerHandle());

+ cm.CreateChannelOnIOThread(id1, channel_pair.PassServerHandle(), cep1);

+ cep1 = nullptr;

+ scoped_refptr<ChannelEndpoint> cep2;

+ scoped_refptr<MessagePipeDispatcher> d2 =

+ MessagePipeDispatcher::CreateRemoteMessagePipe(&cep2);

const ChannelId id2 = 2;

- scoped_refptr<MessagePipeDispatcher> d2 =

- cm.CreateChannelOnIOThread(id2, channel_pair.PassClientHandle());

+ cm.CreateChannelOnIOThread(id2, channel_pair.PassClientHandle(), cep2);

+ cep2 = nullptr;

scoped_refptr<Channel> ch1 = cm.GetChannel(id1);

EXPECT_TRUE(ch1);

@@ -164,9 +173,12 @@

embedder::PlatformChannelPair channel_pair;

+ scoped_refptr<ChannelEndpoint> cep;

+ scoped_refptr<MessagePipeDispatcher> d =

+ MessagePipeDispatcher::CreateRemoteMessagePipe(&cep);

const ChannelId id = 1;

- scoped_refptr<MessagePipeDispatcher> d =

- cm.CreateChannelOnIOThread(id, channel_pair.PassServerHandle());

+ cm.CreateChannelOnIOThread(id, channel_pair.PassServerHandle(), cep);

+ cep = nullptr;

base::RunLoop run_loop;

OtherThread thread(base::MessageLoopProxy::current(), &cm, id,