| Index: remoting/host/security_key/gnubby_extension_session_unittest.cc
|
| diff --git a/remoting/host/security_key/gnubby_extension_session_unittest.cc b/remoting/host/security_key/gnubby_extension_session_unittest.cc
|
| index 2c64a53bdf3b32f5c0ba7fe1afb0ad8059f96c62..c8dafddf1a7a8a59d14d748086eb1d832fa0acfc 100644
|
| --- a/remoting/host/security_key/gnubby_extension_session_unittest.cc
|
| +++ b/remoting/host/security_key/gnubby_extension_session_unittest.cc
|
| @@ -2,12 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "remoting/host/security_key/gnubby_extension_session.h"
|
| +
|
| #include <stddef.h>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| #include "base/strings/stringprintf.h"
|
| @@ -20,7 +23,6 @@
|
| #include "net/socket/unix_domain_client_socket_posix.h"
|
| #include "remoting/host/host_mock_objects.h"
|
| #include "remoting/host/security_key/gnubby_auth_handler.h"
|
| -#include "remoting/host/security_key/gnubby_extension_session.h"
|
| #include "remoting/proto/internal.pb.h"
|
| #include "remoting/protocol/client_stub.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -93,7 +95,7 @@ class TestClientStub : public protocol::ClientStub {
|
|
|
| private:
|
| protocol::ExtensionMessage message_;
|
| - scoped_ptr<base::RunLoop> run_loop_;
|
| + std::unique_ptr<base::RunLoop> run_loop_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestClientStub);
|
| };
|
| @@ -107,7 +109,7 @@ class GnubbyExtensionSessionTest : public testing::Test {
|
| // once |gnubby_extension_session_| is destroyed.
|
| mock_gnubby_auth_handler_ = new MockGnubbyAuthHandler();
|
| gnubby_extension_session_->SetGnubbyAuthHandlerForTesting(
|
| - make_scoped_ptr(mock_gnubby_auth_handler_));
|
| + base::WrapUnique(mock_gnubby_auth_handler_));
|
| }
|
|
|
| void WaitForAndVerifyHostMessage() {
|
| @@ -140,7 +142,7 @@ class GnubbyExtensionSessionTest : public testing::Test {
|
| base::MessageLoopForIO message_loop_;
|
|
|
| // Object under test.
|
| - scoped_ptr<GnubbyExtensionSession> gnubby_extension_session_;
|
| + std::unique_ptr<GnubbyExtensionSession> gnubby_extension_session_;
|
|
|
| MockGnubbyAuthHandler* mock_gnubby_auth_handler_ = nullptr;
|
|
|
|
|