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

Unified Diff: mojo/system/remote_message_pipe_unittest.cc

Issue 502573006: Remove implicit conversions from scoped_refptr to T* in mojo/ (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
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..877c23b6edad2b156ac6ea5503e5b130581f96cb 100644
--- a/mojo/system/remote_message_pipe_unittest.cc
+++ b/mojo/system/remote_message_pipe_unittest.cc
@@ -109,11 +109,11 @@ class RemoteMessagePipeTest : public testing::Test {
void TearDownOnIOThread() {
CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
- if (channels_[0]) {
+ if (channels_[0].get()) {
channels_[0]->Shutdown();
channels_[0] = NULL;
}
- if (channels_[1]) {
+ if (channels_[1].get()) {
channels_[1]->Shutdown();
channels_[1] = NULL;
}
@@ -122,7 +122,7 @@ class RemoteMessagePipeTest : public testing::Test {
void CreateAndInitChannel(unsigned channel_index) {
CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
CHECK(channel_index == 0 || channel_index == 1);
- CHECK(!channels_[channel_index]);
+ CHECK(!channels_[channel_index].get());
channels_[channel_index] = new Channel(&platform_support_);
CHECK(channels_[channel_index]->Init(
@@ -133,9 +133,9 @@ class RemoteMessagePipeTest : public testing::Test {
scoped_refptr<MessagePipe> mp1) {
CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
- if (!channels_[0])
+ if (!channels_[0].get())
CreateAndInitChannel(0);
- if (!channels_[1])
+ if (!channels_[1].get())
CreateAndInitChannel(1);
MessageInTransit::EndpointId local_id0 =
@@ -591,7 +591,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) {
EXPECT_STREQ(kHello, read_buffer);
EXPECT_EQ(1u, read_dispatchers.size());
EXPECT_EQ(1u, read_num_dispatchers);
- ASSERT_TRUE(read_dispatchers[0]);
+ ASSERT_TRUE(read_dispatchers[0].get());
EXPECT_TRUE(read_dispatchers[0]->HasOneRef());
EXPECT_EQ(Dispatcher::kTypeMessagePipe, read_dispatchers[0]->GetType());
@@ -711,7 +711,7 @@ TEST_F(RemoteMessagePipeTest, MAYBE_SharedBufferPassing) {
SharedBufferDispatcher::kDefaultCreateOptions,
100,
&dispatcher));
- ASSERT_TRUE(dispatcher);
+ ASSERT_TRUE(dispatcher.get());
// Make a mapping.
scoped_ptr<embedder::PlatformSharedBufferMapping> mapping0;
@@ -779,7 +779,7 @@ TEST_F(RemoteMessagePipeTest, MAYBE_SharedBufferPassing) {
EXPECT_STREQ(kHello, read_buffer);
EXPECT_EQ(1u, read_dispatchers.size());
EXPECT_EQ(1u, read_num_dispatchers);
- ASSERT_TRUE(read_dispatchers[0]);
+ ASSERT_TRUE(read_dispatchers[0].get());
EXPECT_TRUE(read_dispatchers[0]->HasOneRef());
EXPECT_EQ(Dispatcher::kTypeSharedBuffer, read_dispatchers[0]->GetType());
@@ -905,7 +905,7 @@ TEST_F(RemoteMessagePipeTest, MAYBE_PlatformHandlePassing) {
EXPECT_STREQ(kWorld, read_buffer);
EXPECT_EQ(1u, read_dispatchers.size());
EXPECT_EQ(1u, read_num_dispatchers);
- ASSERT_TRUE(read_dispatchers[0]);
+ ASSERT_TRUE(read_dispatchers[0].get());
EXPECT_TRUE(read_dispatchers[0]->HasOneRef());
EXPECT_EQ(Dispatcher::kTypePlatformHandle, read_dispatchers[0]->GetType());

Powered by Google App Engine
This is Rietveld 408576698