| 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);
|
|
|