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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/system/remote_message_pipe_unittest.cc

Issue 505863002: Mojo: Add static factory functions to MessagePipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 | « mojo/system/multiprocess_message_pipe_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/remote_message_pipe_unittest.cc
diff --git a/mojo/system/remote_message_pipe_unittest.cc b/mojo/system/remote_message_pipe_unittest.cc
index f63543623b4afbe8d0b5d9ee40b999be2d50b993..d4c21ff2812e664bcea9437af86d6cd210d6f7b2 100644
--- a/mojo/system/remote_message_pipe_unittest.cc
+++ b/mojo/system/remote_message_pipe_unittest.cc
@@ -25,11 +25,9 @@
#include "mojo/embedder/scoped_platform_handle.h"
#include "mojo/embedder/simple_platform_support.h"
#include "mojo/system/channel.h"
-#include "mojo/system/local_message_pipe_endpoint.h"
#include "mojo/system/message_pipe.h"
#include "mojo/system/message_pipe_dispatcher.h"
#include "mojo/system/platform_handle_dispatcher.h"
-#include "mojo/system/proxy_message_pipe_endpoint.h"
#include "mojo/system/raw_channel.h"
#include "mojo/system/shared_buffer_dispatcher.h"
#include "mojo/system/test_utils.h"
@@ -193,12 +191,8 @@ TEST_F(RemoteMessagePipeTest, Basic) {
// connected to MP 1, port 0, which will be attached to channel 1. This leaves
// MP 0, port 0 and MP 1, port 1 as the "user-facing" endpoints.
- scoped_refptr<MessagePipe> mp0(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
- scoped_refptr<MessagePipe> mp1(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(MessagePipe::LocalProxy()));
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(MessagePipe::ProxyLocal()));
ConnectMessagePipes(mp0, mp1);
// Write in one direction: MP 0, port 0 -> ... -> MP 1, port 1.
@@ -306,22 +300,14 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
// Connect message pipes as in the |Basic| test.
- scoped_refptr<MessagePipe> mp0(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
- scoped_refptr<MessagePipe> mp1(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(MessagePipe::LocalProxy()));
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(MessagePipe::ProxyLocal()));
ConnectMessagePipes(mp0, mp1);
// Now put another message pipe on the channel.
- scoped_refptr<MessagePipe> mp2(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
- scoped_refptr<MessagePipe> mp3(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp2(new MessagePipe(MessagePipe::LocalProxy()));
+ scoped_refptr<MessagePipe> mp3(new MessagePipe(MessagePipe::ProxyLocal()));
ConnectMessagePipes(mp2, mp3);
// Write: MP 2, port 0 -> MP 3, port 1.
@@ -461,9 +447,7 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeConnect) {
// connected to MP 1, port 0, which will be attached to channel 1. This leaves
// MP 0, port 0 and MP 1, port 1 as the "user-facing" endpoints.
- scoped_refptr<MessagePipe> mp0(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(MessagePipe::LocalProxy()));
// Write to MP 0, port 0.
EXPECT_EQ(MOJO_RESULT_OK,
@@ -478,9 +462,7 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeConnect) {
// Close MP 0, port 0 before channel 1 is even connected.
mp0->Close(0);
- scoped_refptr<MessagePipe> mp1(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(MessagePipe::ProxyLocal()));
// Prepare to wait on MP 1, port 1. (Add the waiter now. Otherwise, if we do
// it later, it might already be readable.)
@@ -523,18 +505,15 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) {
HandleSignalsState hss;
uint32_t context = 0;
- scoped_refptr<MessagePipe> mp0(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
- scoped_refptr<MessagePipe> mp1(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(MessagePipe::LocalProxy()));
darin (slow to review) 2014/08/25 21:56:58 Had you considered a static constructor like Messa
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(MessagePipe::ProxyLocal()));
ConnectMessagePipes(mp0, mp1);
// We'll try to pass this dispatcher.
scoped_refptr<MessagePipeDispatcher> dispatcher(
new MessagePipeDispatcher(MessagePipeDispatcher::kDefaultCreateOptions));
- scoped_refptr<MessagePipe> local_mp(new MessagePipe());
+ scoped_refptr<MessagePipe> local_mp(
+ new MessagePipe(MessagePipe::LocalLocal()));
dispatcher->Init(local_mp, 0);
// Prepare to wait on MP 1, port 1. (Add the waiter now. Otherwise, if we do
@@ -695,12 +674,8 @@ TEST_F(RemoteMessagePipeTest, MAYBE_SharedBufferPassing) {
HandleSignalsState hss;
uint32_t context = 0;
- scoped_refptr<MessagePipe> mp0(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
- scoped_refptr<MessagePipe> mp1(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(MessagePipe::LocalProxy()));
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(MessagePipe::ProxyLocal()));
ConnectMessagePipes(mp0, mp1);
// We'll try to pass this dispatcher.
@@ -833,12 +808,8 @@ TEST_F(RemoteMessagePipeTest, MAYBE_PlatformHandlePassing) {
uint32_t context = 0;
HandleSignalsState hss;
- scoped_refptr<MessagePipe> mp0(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
- scoped_refptr<MessagePipe> mp1(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(MessagePipe::LocalProxy()));
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(MessagePipe::ProxyLocal()));
ConnectMessagePipes(mp0, mp1);
base::FilePath unused;
@@ -940,14 +911,10 @@ TEST_F(RemoteMessagePipeTest, RacingClosesStress) {
for (unsigned i = 0; i < 256; i++) {
DVLOG(2) << "---------------------------------------- " << i;
- scoped_refptr<MessagePipe> mp0(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp0(new MessagePipe(MessagePipe::LocalProxy()));
BootstrapMessagePipeNoWait(0, mp0);
- scoped_refptr<MessagePipe> mp1(new MessagePipe(
- scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()),
- scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint())));
+ scoped_refptr<MessagePipe> mp1(new MessagePipe(MessagePipe::ProxyLocal()));
BootstrapMessagePipeNoWait(1, mp1);
if (i & 1u) {
« no previous file with comments | « mojo/system/multiprocess_message_pipe_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698