Renaming Gnubby and RemoteSecurityKey files/classes/members

remoting/host/security_key/security_key_ipc_server_impl.h

Index: remoting/host/security_key/security_key_ipc_server_impl.h
diff --git a/remoting/host/security_key/remote_security_key_ipc_server_impl.h b/remoting/host/security_key/security_key_ipc_server_impl.h
similarity index 72%
rename from remoting/host/security_key/remote_security_key_ipc_server_impl.h
rename to remoting/host/security_key/security_key_ipc_server_impl.h
index 6f34645073fc14c1891bc7df9b06a13d4fb05aa6..d17a6135f5a126ad36e10b9f0c9db27dfbeecc35 100644
--- a/remoting/host/security_key/remote_security_key_ipc_server_impl.h
+++ b/remoting/host/security_key/security_key_ipc_server_impl.h
@@ -2,10 +2,10 @@
 // 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_IMPL_H_
-#define REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_IPC_SERVER_IMPL_H_
+#ifndef REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_IPC_SERVER_IMPL_H_
+#define REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_IPC_SERVER_IMPL_H_
 
-#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>
@@ -31,18 +31,18 @@ namespace remoting {
 
 // Responsible for handing the server end of the IPC channel between the
 // the network process and the local remote_security_key process.
-class RemoteSecurityKeyIpcServerImpl : public RemoteSecurityKeyIpcServer,
-                                       public IPC::Listener {
+class SecurityKeyIpcServerImpl : public SecurityKeyIpcServer,
+                                 public IPC::Listener {
  public:
-  RemoteSecurityKeyIpcServerImpl(
+  SecurityKeyIpcServerImpl(
       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);
-  ~RemoteSecurityKeyIpcServerImpl() override;
+  ~SecurityKeyIpcServerImpl() override;
 
-  // RemoteSecurityKeyIpcServer implementation.
+  // SecurityKeyIpcServer implementation.
   bool CreateChannel(const std::string& channel_name,
                      base::TimeDelta request_timeout) override;
   bool SendResponse(const std::string& message_data) override;
@@ -79,20 +79,19 @@ class RemoteSecurityKeyIpcServerImpl : public RemoteSecurityKeyIpcServer,
   base::Closure done_callback_;
 
   // Used to pass a security key request on to the remote client.
-  GnubbyAuthHandler::SendMessageCallback message_callback_;
+  SecurityKeyAuthHandler::SendMessageCallback message_callback_;
 
   // Used for sending/receiving security key messages between processes.
   std::unique_ptr<IPC::Channel> ipc_channel_;
 
-  // Ensures RemoteSecurityKeyIpcServerImpl methods are called on the same
-  // thread.
+  // Ensures SecurityKeyIpcServerImpl methods are called on the same thread.
   base::ThreadChecker thread_checker_;
 
-  base::WeakPtrFactory<RemoteSecurityKeyIpcServerImpl> weak_factory_;
+  base::WeakPtrFactory<SecurityKeyIpcServerImpl> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(RemoteSecurityKeyIpcServerImpl);
+  DISALLOW_COPY_AND_ASSIGN(SecurityKeyIpcServerImpl);
 };
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_IPC_SERVER_IMPL_H_
+#endif  // REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_IPC_SERVER_IMPL_H_