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

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

Issue 1353683005: EDK: Convert remaining scoped_ptr -> std::unique_ptr in //mojo/edk/system. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 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/edk/system/test_channel_endpoint_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/test_channel_endpoint_client.cc
diff --git a/mojo/edk/system/test_channel_endpoint_client.cc b/mojo/edk/system/test_channel_endpoint_client.cc
index b3e69b11c8d5674f7541ac23cc66e512cd99cfdf..3b88be80a998424745e5fbc715441115cd0119c0 100644
--- a/mojo/edk/system/test_channel_endpoint_client.cc
+++ b/mojo/edk/system/test_channel_endpoint_client.cc
@@ -34,7 +34,7 @@ size_t TestChannelEndpointClient::NumMessages() const {
return messages_.Size();
}
-scoped_ptr<MessageInTransit> TestChannelEndpointClient::PopMessage() {
+std::unique_ptr<MessageInTransit> TestChannelEndpointClient::PopMessage() {
MutexLocker locker(&mutex_);
if (messages_.IsEmpty())
return nullptr;
@@ -52,7 +52,7 @@ bool TestChannelEndpointClient::OnReadMessage(unsigned port,
EXPECT_EQ(port_, port);
EXPECT_TRUE(endpoint_);
- messages_.AddMessage(make_scoped_ptr(message));
+ messages_.AddMessage(std::unique_ptr<MessageInTransit>(message));
if (read_event_)
read_event_->Signal();
« no previous file with comments | « mojo/edk/system/test_channel_endpoint_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698