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

Unified Diff: mojo/system/shared_buffer_dispatcher_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
« mojo/system/channel.cc ('K') | « mojo/system/shared_buffer_dispatcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/shared_buffer_dispatcher_unittest.cc
diff --git a/mojo/system/shared_buffer_dispatcher_unittest.cc b/mojo/system/shared_buffer_dispatcher_unittest.cc
index 9ea5832f7d5fe1e5b3d62dc660dfd4465cb384d3..397040b469a075d01f4b1b739b4a4dd297e3ff86 100644
--- a/mojo/system/shared_buffer_dispatcher_unittest.cc
+++ b/mojo/system/shared_buffer_dispatcher_unittest.cc
@@ -121,7 +121,7 @@ TEST_F(SharedBufferDispatcherTest, CreateAndMapBuffer) {
SharedBufferDispatcher::kDefaultCreateOptions,
100,
&dispatcher));
- ASSERT_TRUE(dispatcher);
+ ASSERT_TRUE(dispatcher.get());
EXPECT_EQ(Dispatcher::kTypeSharedBuffer, dispatcher->GetType());
// Make a couple of mappings.
@@ -174,7 +174,7 @@ TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandle) {
EXPECT_EQ(
MOJO_RESULT_OK,
dispatcher1->DuplicateBufferHandle(NullUserPointer(), &dispatcher2));
- ASSERT_TRUE(dispatcher2);
+ ASSERT_TRUE(dispatcher2.get());
EXPECT_EQ(Dispatcher::kTypeSharedBuffer, dispatcher2->GetType());
EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close());
@@ -206,7 +206,7 @@ TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsValid) {
EXPECT_EQ(MOJO_RESULT_OK,
dispatcher1->DuplicateBufferHandle(MakeUserPointer(&options[i]),
&dispatcher2));
- ASSERT_TRUE(dispatcher2);
+ ASSERT_TRUE(dispatcher2.get());
EXPECT_EQ(Dispatcher::kTypeSharedBuffer, dispatcher2->GetType());
EXPECT_EQ(MOJO_RESULT_OK, dispatcher2->Close());
}
@@ -231,7 +231,7 @@ TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsInvalid) {
EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
dispatcher1->DuplicateBufferHandle(MakeUserPointer(&options),
&dispatcher2));
- EXPECT_FALSE(dispatcher2);
+ EXPECT_FALSE(dispatcher2.get());
}
// Unknown |flags|.
@@ -242,7 +242,7 @@ TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsInvalid) {
EXPECT_EQ(MOJO_RESULT_UNIMPLEMENTED,
dispatcher1->DuplicateBufferHandle(MakeUserPointer(&options),
&dispatcher2));
- EXPECT_FALSE(dispatcher2);
+ EXPECT_FALSE(dispatcher2.get());
}
EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close());
@@ -257,7 +257,7 @@ TEST_F(SharedBufferDispatcherTest, CreateInvalidNumBytes) {
SharedBufferDispatcher::kDefaultCreateOptions,
std::numeric_limits<uint64_t>::max(),
&dispatcher));
- EXPECT_FALSE(dispatcher);
+ EXPECT_FALSE(dispatcher.get());
// Zero size.
EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
@@ -266,7 +266,7 @@ TEST_F(SharedBufferDispatcherTest, CreateInvalidNumBytes) {
SharedBufferDispatcher::kDefaultCreateOptions,
0,
&dispatcher));
- EXPECT_FALSE(dispatcher);
+ EXPECT_FALSE(dispatcher.get());
}
TEST_F(SharedBufferDispatcherTest, MapBufferInvalidArguments) {
« mojo/system/channel.cc ('K') | « mojo/system/shared_buffer_dispatcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698