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

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

Issue 1350503004: Some easy conversions of scoped_ptr -> std::unique_ptr in the EDK. (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/remote_consumer_data_pipe_impl.h ('k') | mojo/edk/system/remote_producer_data_pipe_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/remote_message_pipe_unittest.cc
diff --git a/mojo/edk/system/remote_message_pipe_unittest.cc b/mojo/edk/system/remote_message_pipe_unittest.cc
index 146848fefe170b4b3fe21f19a670bf571da64578..51652873100ebaf82aab1b1abd5994e79ef360c6 100644
--- a/mojo/edk/system/remote_message_pipe_unittest.cc
+++ b/mojo/edk/system/remote_message_pipe_unittest.cc
@@ -6,6 +6,7 @@
#include <stdio.h>
#include <string.h>
+#include <memory>
#include <vector>
#include "base/bind.h"
@@ -337,7 +338,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
&max_platform_handle_count);
EXPECT_GT(max_endpoint_info_size, 0u);
ASSERT_EQ(0u, max_platform_handle_count);
- scoped_ptr<char[]> endpoint_info(new char[max_endpoint_info_size]);
+ std::unique_ptr<char[]> endpoint_info(new char[max_endpoint_info_size]);
size_t endpoint_info_size;
mp2->EndSerialize(1, channels(0), endpoint_info.get(), &endpoint_info_size,
nullptr);
@@ -362,7 +363,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
EXPECT_EQ(kAllSignals, hss.satisfiable_signals);
EXPECT_EQ(endpoint_info_size, channels(1)->GetSerializedEndpointSize());
- scoped_ptr<char[]> received_endpoint_info(new char[endpoint_info_size]);
+ std::unique_ptr<char[]> received_endpoint_info(new char[endpoint_info_size]);
buffer_size = static_cast<uint32_t>(endpoint_info_size);
EXPECT_EQ(MOJO_RESULT_OK,
mp1->ReadMessage(1, UserPointer<void>(received_endpoint_info.get()),
« no previous file with comments | « mojo/edk/system/remote_consumer_data_pipe_impl.h ('k') | mojo/edk/system/remote_producer_data_pipe_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698