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

Unified Diff: mojo/edk/system/channel_test_base.h

Issue 1350503005: EDK: Some more scoped_ptr -> std::unique_ptr conversions. (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/channel.cc ('k') | mojo/edk/system/channel_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/channel_test_base.h
diff --git a/mojo/edk/system/channel_test_base.h b/mojo/edk/system/channel_test_base.h
index d8ee13e99c9fa22a584a0bd84671531c83ddfc8a..b1e81d7ba2d5077dedaed575e068b85d2e2315d4 100644
--- a/mojo/edk/system/channel_test_base.h
+++ b/mojo/edk/system/channel_test_base.h
@@ -5,10 +5,11 @@
#ifndef MOJO_EDK_SYSTEM_CHANNEL_TEST_BASE_H_
#define MOJO_EDK_SYSTEM_CHANNEL_TEST_BASE_H_
+#include <memory>
+
#include "base/bind.h"
#include "base/location.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "mojo/edk/embedder/simple_platform_support.h"
#include "mojo/edk/system/channel.h"
#include "mojo/edk/test/test_io_thread.h"
@@ -54,7 +55,7 @@ class ChannelTestBase : public testing::Test {
embedder::SimplePlatformSupport platform_support_;
mojo::test::TestIOThread io_thread_;
- scoped_ptr<RawChannel> raw_channels_[2];
+ std::unique_ptr<RawChannel> raw_channels_[2];
scoped_refptr<Channel> channels_[2];
MOJO_DISALLOW_COPY_AND_ASSIGN(ChannelTestBase);
« no previous file with comments | « mojo/edk/system/channel.cc ('k') | mojo/edk/system/channel_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698