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

Unified Diff: mojo/edk/embedder/embedder_unittest.cc

Issue 1351293002: Convert remaining scoped_ptr -> std::unique_ptr in //mojo/edk (minus js). (Closed) Base URL: https://github.com/domokit/mojo.git@edk_unique_ptr_5
Patch Set: oops, forgot to fix android 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/embedder/embedder.cc ('k') | mojo/edk/embedder/platform_channel_pair.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/embedder/embedder_unittest.cc
diff --git a/mojo/edk/embedder/embedder_unittest.cc b/mojo/edk/embedder/embedder_unittest.cc
index aa454586c29b87c01814243ada64d132581ea0d4..ef231cee117c933ed3242f0ab2e545dc2796bfba 100644
--- a/mojo/edk/embedder/embedder_unittest.cc
+++ b/mojo/edk/embedder/embedder_unittest.cc
@@ -6,6 +6,8 @@
#include <string.h>
+#include <memory>
+
#include "base/bind.h"
#include "base/command_line.h"
#include "base/location.h"
@@ -454,7 +456,7 @@ TEST_F(EmbedderTest, ChannelShutdownRace_MessagePipeClose) {
for (size_t i = 0; i < kIterations; i++) {
PlatformChannelPair channel_pair;
- scoped_ptr<ScopedTestChannel> server_channel(
+ std::unique_ptr<ScopedTestChannel> server_channel(
new ScopedTestChannel(channel_pair.PassServerHandle()));
server_channel->WaitForChannelCreationCompletion();
server_channel->NoWaitOnShutdown();
« no previous file with comments | « mojo/edk/embedder/embedder.cc ('k') | mojo/edk/embedder/platform_channel_pair.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698