| Index: chrome/browser/extensions/api/socket/tls_socket_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
|
| index b360dcf6283e2336feef49efa36c5fe8d1f4c027..dd172da21bf48558d6816d51893e3df2e85dba78 100644
|
| --- a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
|
| +++ b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
|
| @@ -2,17 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "extensions/browser/api/socket/tls_socket.h"
|
| -
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| #include <deque>
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_piece.h"
|
| +#include "extensions/browser/api/socket/tls_socket.h"
|
| #include "net/base/address_list.h"
|
| #include "net/base/completion_callback.h"
|
| #include "net/base/io_buffer.h"
|
| @@ -125,7 +124,7 @@ class TLSSocketTest : public ::testing::Test {
|
| net::AddressList address_list;
|
| // |ssl_socket_| is owned by |socket_|. TLSSocketTest keeps a pointer to
|
| // it to expect invocations from TLSSocket to |ssl_socket_|.
|
| - scoped_ptr<MockSSLClientSocket> ssl_sock(new MockSSLClientSocket);
|
| + std::unique_ptr<MockSSLClientSocket> ssl_sock(new MockSSLClientSocket);
|
| ssl_socket_ = ssl_sock.get();
|
| socket_.reset(new TLSSocket(std::move(ssl_sock), "test_extension_id"));
|
| EXPECT_CALL(*ssl_socket_, Disconnect()).Times(1);
|
| @@ -138,7 +137,7 @@ class TLSSocketTest : public ::testing::Test {
|
|
|
| protected:
|
| MockSSLClientSocket* ssl_socket_;
|
| - scoped_ptr<TLSSocket> socket_;
|
| + std::unique_ptr<TLSSocket> socket_;
|
| };
|
|
|
| // Verify that a Read() on TLSSocket will pass through into a Read() on
|
|
|