Renaming Gnubby and RemoteSecurityKey files/classes/members

remoting/host/security_key/security_key_ipc_server_impl.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // 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_impl.h"
+#include "remoting/host/security_key/security_key_ipc_server_impl.h"
 
 #include <cstdint>
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 16 matching lines @@
 // Returns the command code (the first byte of the data) if it exists, or -1 if
 // the data is empty.
 unsigned int GetCommandCode(const std::string& data) {
   return data.empty() ? -1 : static_cast<unsigned int>(data[0]);
 }
 
 }  // namespace
 
 namespace remoting {
 
-RemoteSecurityKeyIpcServerImpl::RemoteSecurityKeyIpcServerImpl(
+SecurityKeyIpcServerImpl::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)
     : connection_id_(connection_id),
       peer_session_id_(peer_session_id),
       initial_connect_timeout_(initial_connect_timeout),
       done_callback_(done_callback),
       message_callback_(message_callback),
       weak_factory_(this) {
   DCHECK_GT(connection_id_, 0);
   DCHECK(!done_callback_.is_null());
   DCHECK(!message_callback_.is_null());
 }
 
-RemoteSecurityKeyIpcServerImpl::~RemoteSecurityKeyIpcServerImpl() {}
+SecurityKeyIpcServerImpl::~SecurityKeyIpcServerImpl() {}
 
-bool RemoteSecurityKeyIpcServerImpl::CreateChannel(
-    const std::string& channel_name,
-    base::TimeDelta request_timeout) {
+bool SecurityKeyIpcServerImpl::CreateChannel(const std::string& channel_name,
+                                             base::TimeDelta request_timeout) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!ipc_channel_);
   security_key_request_timeout_ = request_timeout;
 
 #if defined(OS_WIN)
   // Create a named pipe owned by the current user (the LocalService account
   // (SID: S-1-5-19) when running in the network process) which is available to
   // all authenticated users.
   // presubmit: allow wstring
   std::wstring user_sid;
@@ skipping 18 matching lines @@
 
   if (!ipc_channel_->Connect()) {
     ipc_channel_.reset();
     return false;
   }
   // It is safe to use base::Unretained here as |timer_| will be stopped and
   // this task will be removed when this instance is being destroyed.  All
   // methods must execute on the same thread (due to |thread_Checker_| so
   // the posted task and D'Tor can not execute concurrently.
   timer_.Start(FROM_HERE, initial_connect_timeout_,
-               base::Bind(&RemoteSecurityKeyIpcServerImpl::OnChannelError,
+               base::Bind(&SecurityKeyIpcServerImpl::OnChannelError,
                           base::Unretained(this)));
   return true;
 }
 
-bool RemoteSecurityKeyIpcServerImpl::SendResponse(const std::string& response) {
+bool SecurityKeyIpcServerImpl::SendResponse(const std::string& response) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Since we have received a response, we update the timer and wait
   // for a subsequent request.
   timer_.Start(FROM_HERE, security_key_request_timeout_,
-               base::Bind(&RemoteSecurityKeyIpcServerImpl::OnChannelError,
+               base::Bind(&SecurityKeyIpcServerImpl::OnChannelError,
                           base::Unretained(this)));
 
   return ipc_channel_->Send(
       new ChromotingNetworkToRemoteSecurityKeyMsg_Response(response));
 }
 
-bool RemoteSecurityKeyIpcServerImpl::OnMessageReceived(
-    const IPC::Message& message) {
+bool SecurityKeyIpcServerImpl::OnMessageReceived(const IPC::Message& message) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (connection_close_pending_) {
     LOG(WARNING) << "IPC Message ignored because channel is being closed.";
     return false;
   }
 
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(RemoteSecurityKeyIpcServerImpl, message)
+  IPC_BEGIN_MESSAGE_MAP(SecurityKeyIpcServerImpl, message)
     IPC_MESSAGE_HANDLER(ChromotingRemoteSecurityKeyToNetworkMsg_Request,
                         OnSecurityKeyRequest)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   CHECK(handled) << "Received unexpected IPC type: " << message.type();
   return handled;
 }
 
-void RemoteSecurityKeyIpcServerImpl::OnChannelConnected(int32_t peer_pid) {
+void SecurityKeyIpcServerImpl::OnChannelConnected(int32_t peer_pid) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
 #if defined(OS_WIN)
   DWORD peer_session_id;
   if (!ProcessIdToSessionId(peer_pid, &peer_session_id)) {
     PLOG(ERROR) << "ProcessIdToSessionId() failed";
     connection_close_pending_ = true;
   } else if (peer_session_id != peer_session_id_) {
     LOG(ERROR) << "Ignoring connection attempt from outside remoted session.";
     connection_close_pending_ = true;
   }
   if (connection_close_pending_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(&RemoteSecurityKeyIpcServerImpl::OnChannelError,
+        FROM_HERE, base::Bind(&SecurityKeyIpcServerImpl::OnChannelError,
                               weak_factory_.GetWeakPtr()));
     return;
   }
 #else   // !defined(OS_WIN)
   CHECK_EQ(peer_session_id_, UINT32_MAX);
 #endif  // !defined(OS_WIN)
 
   // Reset the timer to give the client a chance to send the request.
   timer_.Start(FROM_HERE, initial_connect_timeout_,
-               base::Bind(&RemoteSecurityKeyIpcServerImpl::OnChannelError,
+               base::Bind(&SecurityKeyIpcServerImpl::OnChannelError,
                           base::Unretained(this)));
 }
 
-void RemoteSecurityKeyIpcServerImpl::OnChannelError() {
+void SecurityKeyIpcServerImpl::OnChannelError() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (ipc_channel_) {
     ipc_channel_->Close();
     connection_close_pending_ = false;
   }
 
   if (!done_callback_.is_null()) {
     // Note: This callback may result in this object being torn down.
     base::ResetAndReturn(&done_callback_).Run();
   }
 }
 
-void RemoteSecurityKeyIpcServerImpl::OnSecurityKeyRequest(
+void SecurityKeyIpcServerImpl::OnSecurityKeyRequest(
     const std::string& request_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Reset the timer to give the client a chance to send the response.
   timer_.Start(FROM_HERE, security_key_request_timeout_,
-               base::Bind(&RemoteSecurityKeyIpcServerImpl::OnChannelError,
+               base::Bind(&SecurityKeyIpcServerImpl::OnChannelError,
                           base::Unretained(this)));
 
-  HOST_LOG << "Received gnubby request: " << GetCommandCode(request_data);
+  HOST_LOG << "Received security key request: " << GetCommandCode(request_data);
   message_callback_.Run(connection_id_, request_data);
 }
 
 }  // namespace remoting