| Index: google_apis/gcm/base/socket_stream_unittest.cc
|
| diff --git a/google_apis/gcm/base/socket_stream_unittest.cc b/google_apis/gcm/base/socket_stream_unittest.cc
|
| index 6838ec42568f4e5597e34bc3fa6f376a4eae4c52..2f04308c3c742e7747e6868ad7403ebcab90f577 100644
|
| --- a/google_apis/gcm/base/socket_stream_unittest.cc
|
| +++ b/google_apis/gcm/base/socket_stream_unittest.cc
|
| @@ -6,9 +6,10 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/bind.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/run_loop.h"
|
| #include "base/strings/string_piece.h"
|
| #include "net/base/ip_address.h"
|
| @@ -65,12 +66,12 @@ class GCMSocketStreamTest : public testing::Test {
|
| // SocketStreams and their data providers.
|
| ReadList mock_reads_;
|
| WriteList mock_writes_;
|
| - scoped_ptr<net::StaticSocketDataProvider> data_provider_;
|
| - scoped_ptr<SocketInputStream> socket_input_stream_;
|
| - scoped_ptr<SocketOutputStream> socket_output_stream_;
|
| + std::unique_ptr<net::StaticSocketDataProvider> data_provider_;
|
| + std::unique_ptr<SocketInputStream> socket_input_stream_;
|
| + std::unique_ptr<SocketOutputStream> socket_output_stream_;
|
|
|
| // net:: components.
|
| - scoped_ptr<net::StreamSocket> socket_;
|
| + std::unique_ptr<net::StreamSocket> socket_;
|
| net::MockClientSocketFactory socket_factory_;
|
| net::AddressList address_list_;
|
|
|
|
|