| Index: remoting/host/security_key/security_key_ipc_server.cc
|
| diff --git a/remoting/host/security_key/remote_security_key_ipc_server.cc b/remoting/host/security_key/security_key_ipc_server.cc
|
| similarity index 66%
|
| rename from remoting/host/security_key/remote_security_key_ipc_server.cc
|
| rename to remoting/host/security_key/security_key_ipc_server.cc
|
| index 592328ffe1977ddab0c22d3d68d86a2521bbb56d..565cf88b0655168730856e3a6e046b93253d6cab 100644
|
| --- a/remoting/host/security_key/remote_security_key_ipc_server.cc
|
| +++ b/remoting/host/security_key/security_key_ipc_server.cc
|
| @@ -2,7 +2,7 @@
|
| // 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/remote_security_key_ipc_server.h"
|
| +#include "remoting/host/security_key/security_key_ipc_server.h"
|
|
|
| #include <cstdint>
|
| #include <memory>
|
| @@ -17,34 +17,34 @@
|
| #include "ipc/ipc_message_macros.h"
|
| #include "remoting/base/logging.h"
|
| #include "remoting/host/chromoting_messages.h"
|
| -#include "remoting/host/security_key/remote_security_key_ipc_server_impl.h"
|
| +#include "remoting/host/security_key/security_key_ipc_server_impl.h"
|
|
|
| namespace {
|
|
|
| // Not thread safe, tests which set this value must do so on the same thread.
|
| -static remoting::RemoteSecurityKeyIpcServerFactory* g_factory = nullptr;
|
| +static remoting::SecurityKeyIpcServerFactory* g_factory = nullptr;
|
|
|
| } // namespace
|
|
|
| namespace remoting {
|
|
|
| -void RemoteSecurityKeyIpcServer::SetFactoryForTest(
|
| - RemoteSecurityKeyIpcServerFactory* factory) {
|
| +void SecurityKeyIpcServer::SetFactoryForTest(
|
| + SecurityKeyIpcServerFactory* factory) {
|
| g_factory = factory;
|
| }
|
|
|
| -std::unique_ptr<RemoteSecurityKeyIpcServer> RemoteSecurityKeyIpcServer::Create(
|
| +std::unique_ptr<SecurityKeyIpcServer> SecurityKeyIpcServer::Create(
|
| int connection_id,
|
| uint32_t peer_session_id,
|
| base::TimeDelta initial_connect_timeout,
|
| - const GnubbyAuthHandler::SendMessageCallback& message_callback,
|
| + const SecurityKeyAuthHandler::SendMessageCallback& message_callback,
|
| const base::Closure& done_callback) {
|
| - std::unique_ptr<RemoteSecurityKeyIpcServer> ipc_server =
|
| + std::unique_ptr<SecurityKeyIpcServer> ipc_server =
|
| g_factory
|
| ? g_factory->Create(connection_id, peer_session_id,
|
| initial_connect_timeout, message_callback,
|
| done_callback)
|
| - : base::WrapUnique(new RemoteSecurityKeyIpcServerImpl(
|
| + : base::WrapUnique(new SecurityKeyIpcServerImpl(
|
| connection_id, peer_session_id, initial_connect_timeout,
|
| message_callback, done_callback));
|
|
|
|
|