| Index: remoting/host/security_key/security_key_ipc_server.h
|
| diff --git a/remoting/host/security_key/remote_security_key_ipc_server.h b/remoting/host/security_key/security_key_ipc_server.h
|
| similarity index 53%
|
| rename from remoting/host/security_key/remote_security_key_ipc_server.h
|
| rename to remoting/host/security_key/security_key_ipc_server.h
|
| index ed34853e54566995dbdf4f4e632d3d2bc4a34222..be7d99d8fbcced8af4bb56df07bbfce89da6be2c 100644
|
| --- a/remoting/host/security_key/remote_security_key_ipc_server.h
|
| +++ b/remoting/host/security_key/security_key_ipc_server.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_IPC_SERVER_H_
|
| -#define REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_IPC_SERVER_H_
|
| +#ifndef REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_IPC_SERVER_H_
|
| +#define REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_IPC_SERVER_H_
|
|
|
| #include <cstdint>
|
| #include <memory>
|
| @@ -11,29 +11,29 @@
|
|
|
| #include "base/callback_forward.h"
|
| #include "base/time/time.h"
|
| -#include "remoting/host/security_key/gnubby_auth_handler.h"
|
| +#include "remoting/host/security_key/security_key_auth_handler.h"
|
|
|
| namespace remoting {
|
|
|
| -class RemoteSecurityKeyIpcServerFactory;
|
| +class SecurityKeyIpcServerFactory;
|
|
|
| // Responsible for handing the server end of the IPC channel between the
|
| // network process (server) and the remote_security_key process (client).
|
| -class RemoteSecurityKeyIpcServer {
|
| +class SecurityKeyIpcServer {
|
| public:
|
| - virtual ~RemoteSecurityKeyIpcServer() {}
|
| + virtual ~SecurityKeyIpcServer() {}
|
|
|
| - // Creates a new RemoteSecurityKeyIpcServer instance.
|
| - static std::unique_ptr<RemoteSecurityKeyIpcServer> Create(
|
| + // Creates a new SecurityKeyIpcServer instance.
|
| + static std::unique_ptr<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);
|
|
|
| - // Used to set a Factory to generate fake/mock RemoteSecurityKeyIpcServer
|
| + // Used to set a Factory to generate fake/mock SecurityKeyIpcServer
|
| // instances for testing.
|
| - static void SetFactoryForTest(RemoteSecurityKeyIpcServerFactory* factory);
|
| + static void SetFactoryForTest(SecurityKeyIpcServerFactory* factory);
|
|
|
| // Creates and starts listening on an IPC channel with the given name.
|
| virtual bool CreateChannel(const std::string& channel_name,
|
| @@ -43,19 +43,19 @@ class RemoteSecurityKeyIpcServer {
|
| virtual bool SendResponse(const std::string& message_data) = 0;
|
| };
|
|
|
| -// Used to allow for creating Fake/Mock RemoteSecurityKeyIpcServer for testing.
|
| -class RemoteSecurityKeyIpcServerFactory {
|
| +// Used to allow for creating Fake/Mock SecurityKeyIpcServer for testing.
|
| +class SecurityKeyIpcServerFactory {
|
| public:
|
| - virtual ~RemoteSecurityKeyIpcServerFactory() {}
|
| + virtual ~SecurityKeyIpcServerFactory() {}
|
|
|
| - virtual std::unique_ptr<RemoteSecurityKeyIpcServer> Create(
|
| + virtual std::unique_ptr<SecurityKeyIpcServer> Create(
|
| int connection_id,
|
| uint32_t peer_session_id,
|
| base::TimeDelta connect_timeout,
|
| - const GnubbyAuthHandler::SendMessageCallback& message_callback,
|
| + const SecurityKeyAuthHandler::SendMessageCallback& message_callback,
|
| const base::Closure& done_callback) = 0;
|
| };
|
|
|
| } // namespace remoting
|
|
|
| -#endif // REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_IPC_SERVER_H_
|
| +#endif // REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_IPC_SERVER_H_
|
|
|