Renaming Gnubby and RemoteSecurityKey files/classes/members

remoting/host/security_key/security_key_message_handler.h

Index: remoting/host/security_key/security_key_message_handler.h
diff --git a/remoting/host/security_key/remote_security_key_message_handler.h b/remoting/host/security_key/security_key_message_handler.h
similarity index 51%
rename from remoting/host/security_key/remote_security_key_message_handler.h
rename to remoting/host/security_key/security_key_message_handler.h
index f36e3ed034ee8b340ea57c249682d5c96348c1e9..c14d393f85b18b32114af1c6ba9e0ccd422b93ea 100644
--- a/remoting/host/security_key/remote_security_key_message_handler.h
+++ b/remoting/host/security_key/security_key_message_handler.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_MESSAGE_HANDLER_H_
-#define REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_MESSAGE_HANDLER_H_
+#ifndef REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_HANDLER_H_
+#define REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_HANDLER_H_
 
 #include <memory>
 #include <string>
@@ -16,75 +16,74 @@
 
 namespace remoting {
 
-class RemoteSecurityKeyIpcClient;
-class RemoteSecurityKeyMessageReader;
-class RemoteSecurityKeyMessageWriter;
+class SecurityKeyIpcClient;
+class SecurityKeyMessageReader;
+class SecurityKeyMessageWriter;
 
-// Routes security key messages to the remote client and receives response from
-// the remote client and forwards them to the local security key tools.
-class RemoteSecurityKeyMessageHandler {
+// Routes security key messages to the client and receives response from
+// the client and forwards them to the local security key tools.
+class SecurityKeyMessageHandler {
  public:
-  RemoteSecurityKeyMessageHandler();
-  ~RemoteSecurityKeyMessageHandler();
+  SecurityKeyMessageHandler();
+  ~SecurityKeyMessageHandler();
 
   // Sets up the handler to begin receiving and processing messages.
   void Start(base::File message_read_stream,
              base::File message_write_stream,
-             std::unique_ptr<RemoteSecurityKeyIpcClient> ipc_client,
+             std::unique_ptr<SecurityKeyIpcClient> ipc_client,
              const base::Closure& error_callback);
 
   // Sets |reader_| to the instance passed in via |reader|.  This method should
   // be called before Start().
-  void SetRemoteSecurityKeyMessageReaderForTest(
-      std::unique_ptr<RemoteSecurityKeyMessageReader> reader);
+  void SetSecurityKeyMessageReaderForTest(
+      std::unique_ptr<SecurityKeyMessageReader> reader);
 
   // Sets |writer_| to the instance passed in via |writer|.  This method should
   // be called before Start().
-  void SetRemoteSecurityKeyMessageWriterForTest(
-      std::unique_ptr<RemoteSecurityKeyMessageWriter> writer);
+  void SetSecurityKeyMessageWriterForTest(
+      std::unique_ptr<SecurityKeyMessageWriter> writer);
 
  private:
-  // RemoteSecurityKeyMessage handler.
-  void ProcessRemoteSecurityKeyMessage(
-      std::unique_ptr<SecurityKeyMessage> message);
+  // SecurityKeyMessage handler.
+  void ProcessSecurityKeyMessage(std::unique_ptr<SecurityKeyMessage> message);
 
   // Cleans up resources when an error occurs.
   void OnError();
 
   // Writes the passed in message data using |writer_|.
-  void SendMessage(RemoteSecurityKeyMessageType message_type);
-  void SendMessageWithPayload(RemoteSecurityKeyMessageType message_type,
+  void SendMessage(SecurityKeyMessageType message_type);
+  void SendMessageWithPayload(SecurityKeyMessageType message_type,
                               const std::string& message_payload);
 
   // Used to respond to IPC connection changes.
   void HandleIpcConnectionChange(bool connection_established);
 
-  // Handles responses received from the remote client.
+  // Handles responses received from the client.
   void HandleSecurityKeyResponse(const std::string& response_data);
 
   // Handles requests to establich a connection with the Chromoting host.
   void HandleConnectRequest(const std::string& message_payload);
 
-  // handles security key requests by forwrding them to the remote client.
+  // handles security key requests by forwrding them to the client.
   void HandleSecurityKeyRequest(const std::string& message_payload);
 
-  // Used to communicate with the remote security key.
-  std::unique_ptr<RemoteSecurityKeyIpcClient> ipc_client_;
+  // Used to communicate with the security key.
+  std::unique_ptr<SecurityKeyIpcClient> ipc_client_;
 
   // Used to listen for security key messages.
-  std::unique_ptr<RemoteSecurityKeyMessageReader> reader_;
+  std::unique_ptr<SecurityKeyMessageReader> reader_;
 
   // Used to write security key messages to local security key tools.
-  std::unique_ptr<RemoteSecurityKeyMessageWriter> writer_;
+  std::unique_ptr<SecurityKeyMessageWriter> writer_;
 
   // Signaled when an error occurs.
   base::Closure error_callback_;
 
   base::ThreadChecker thread_checker_;
 
-  DISALLOW_COPY_AND_ASSIGN(RemoteSecurityKeyMessageHandler);
+  DISALLOW_COPY_AND_ASSIGN(SecurityKeyMessageHandler);
 };
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_SECURITY_KEY_REMOTE_SECURITY_KEY_MESSAGE_HANDLER_H_
+#endif  // REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_HANDLER_H_