Renaming Gnubby and RemoteSecurityKey files/classes/members

remoting/host/security_key/security_key_auth_handler_win_unittest.cc

Index: remoting/host/security_key/security_key_auth_handler_win_unittest.cc
diff --git a/remoting/host/security_key/gnubby_auth_handler_win_unittest.cc b/remoting/host/security_key/security_key_auth_handler_win_unittest.cc
similarity index 58%
rename from remoting/host/security_key/gnubby_auth_handler_win_unittest.cc
rename to remoting/host/security_key/security_key_auth_handler_win_unittest.cc
index 75a0468b20bd45ad0617e9313991fd3d3740af92..8f52476f16138907754f8127392e5fc97e4d1117 100644
--- a/remoting/host/security_key/gnubby_auth_handler_win_unittest.cc
+++ b/remoting/host/security_key/security_key_auth_handler_win_unittest.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/gnubby_auth_handler.h"
+#include "remoting/host/security_key/security_key_auth_handler.h"
 
 #include <cstdint>
 #include <memory>
@@ -18,9 +18,9 @@
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "remoting/host/host_mock_objects.h"
-#include "remoting/host/security_key/fake_remote_security_key_ipc_client.h"
-#include "remoting/host/security_key/fake_remote_security_key_ipc_server.h"
-#include "remoting/host/security_key/remote_security_key_ipc_constants.h"
+#include "remoting/host/security_key/fake_security_key_ipc_client.h"
+#include "remoting/host/security_key/fake_security_key_ipc_server.h"
+#include "remoting/host/security_key/security_key_ipc_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -31,10 +31,10 @@ const int kConnectionId2 = 2;
 
 namespace remoting {
 
-class GnubbyAuthHandlerWinTest : public testing::Test {
+class SecurityKeyAuthHandlerWinTest : public testing::Test {
  public:
-  GnubbyAuthHandlerWinTest();
-  ~GnubbyAuthHandlerWinTest() override;
+  SecurityKeyAuthHandlerWinTest();
+  ~SecurityKeyAuthHandlerWinTest() override;
 
   // Passed to the object used for testing to be called back to signal
   // completion of an IPC channel state change or reception of an IPC message.
@@ -48,8 +48,8 @@ class GnubbyAuthHandlerWinTest : public testing::Test {
   // back when a security key request is received by it.
   void SendMessageToClient(int connection_id, const std::string& data);
 
-  // Creates a new gnubby connection on the object under test.
-  void CreateGnubbyConnection(const std::string& channel_name);
+  // Creates a new security key connection on the object under test.
+  void CreateSecurityKeyConnection(const std::string& channel_name);
 
   // Sets |desktop_session_id_| to the id for the current Windows session.
   void InitializeDesktopSessionId();
@@ -57,29 +57,28 @@ class GnubbyAuthHandlerWinTest : public testing::Test {
   // Uses |fake_ipc_client| to connect to the initial IPC server channel, it
   // then validates internal state of the object under test and closes the
   // connection based on |close_connection|.
-  void EstablishInitialIpcConnection(
-      FakeRemoteSecurityKeyIpcClient* fake_ipc_client,
-      int expected_connection_id,
-      const std::string& channel_name,
-      bool close_connection);
+  void EstablishInitialIpcConnection(FakeSecurityKeyIpcClient* fake_ipc_client,
+                                     int expected_connection_id,
+                                     const std::string& channel_name,
+                                     bool close_connection);
 
   // Sends a security key response message using |fake_ipc_server| and
   // validates the state of the object under test.
-  void SendRequestToGnubbyAuthHandler(
-      const base::WeakPtr<FakeRemoteSecurityKeyIpcServer>& fake_ipc_server,
+  void SendRequestToSecurityKeyAuthHandler(
+      const base::WeakPtr<FakeSecurityKeyIpcServer>& fake_ipc_server,
       int connection_id,
       const std::string& request_payload);
 
   // Sends a security key response message to |fake_ipc_server| and validates
   // the state of the object under test.
-  void SendResponseViaGnubbyAuthHandler(
-      const base::WeakPtr<FakeRemoteSecurityKeyIpcServer>& fake_ipc_server,
+  void SendResponseViaSecurityKeyAuthHandler(
+      const base::WeakPtr<FakeSecurityKeyIpcServer>& fake_ipc_server,
       int connection_id,
       const std::string& response_payload);
 
   // Closes a security key session IPC channel and validates state.
   void CloseSecurityKeySessionIpcChannel(
-      const base::WeakPtr<FakeRemoteSecurityKeyIpcServer>& fake_ipc_server,
+      const base::WeakPtr<FakeSecurityKeyIpcServer>& fake_ipc_server,
       int connection_id);
 
   // Returns a unique IPC channel name which prevents conflicts when running
@@ -94,12 +93,12 @@ class GnubbyAuthHandlerWinTest : public testing::Test {
   std::unique_ptr<base::RunLoop> run_loop_;
 
   // The object under test.
-  std::unique_ptr<GnubbyAuthHandler> auth_handler_;
+  std::unique_ptr<SecurityKeyAuthHandler> auth_handler_;
 
-  // Set as the default factory to create RemoteSecurityKeyIpcServerFactory
+  // Set as the default factory to create SecurityKeyIpcServerFactory
   // instances, this class will track each objects creation and allow the tests
   // to access it and use it for driving tests and validating state.
-  FakeRemoteSecurityKeyIpcServerFactory ipc_server_factory_;
+  FakeSecurityKeyIpcServerFactory ipc_server_factory_;
 
   // Used to validate the object under test uses the correct ID when
   // communicating over the IPC channel.
@@ -115,49 +114,50 @@ class GnubbyAuthHandlerWinTest : public testing::Test {
  private:
   testing::NiceMock<MockClientSessionDetails> mock_client_session_details_;
 
-  DISALLOW_COPY_AND_ASSIGN(GnubbyAuthHandlerWinTest);
+  DISALLOW_COPY_AND_ASSIGN(SecurityKeyAuthHandlerWinTest);
 };
 
-GnubbyAuthHandlerWinTest::GnubbyAuthHandlerWinTest()
+SecurityKeyAuthHandlerWinTest::SecurityKeyAuthHandlerWinTest()
     : run_loop_(new base::RunLoop()) {
-  auth_handler_ = remoting::GnubbyAuthHandler::Create(
+  auth_handler_ = remoting::SecurityKeyAuthHandler::Create(
       &mock_client_session_details_,
-      base::Bind(&GnubbyAuthHandlerWinTest::SendMessageToClient,
+      base::Bind(&SecurityKeyAuthHandlerWinTest::SendMessageToClient,
                  base::Unretained(this)));
 }
 
-GnubbyAuthHandlerWinTest::~GnubbyAuthHandlerWinTest() {}
+SecurityKeyAuthHandlerWinTest::~SecurityKeyAuthHandlerWinTest() {}
 
-void GnubbyAuthHandlerWinTest::OperationComplete() {
+void SecurityKeyAuthHandlerWinTest::OperationComplete() {
   run_loop_->Quit();
 }
 
-void GnubbyAuthHandlerWinTest::WaitForOperationComplete() {
+void SecurityKeyAuthHandlerWinTest::WaitForOperationComplete() {
   run_loop_->Run();
   run_loop_.reset(new base::RunLoop());
 }
 
-void GnubbyAuthHandlerWinTest::SendMessageToClient(int connection_id,
-                                                   const std::string& data) {
+void SecurityKeyAuthHandlerWinTest::SendMessageToClient(
+    int connection_id,
+    const std::string& data) {
   last_connection_id_received_ = connection_id;
   last_message_received_ = data;
   OperationComplete();
 }
 
-void GnubbyAuthHandlerWinTest::CreateGnubbyConnection(
+void SecurityKeyAuthHandlerWinTest::CreateSecurityKeyConnection(
     const std::string& channel_name) {
   ASSERT_EQ(0u, auth_handler_->GetActiveConnectionCountForTest());
 
-  remoting::SetRemoteSecurityKeyIpcChannelNameForTest(channel_name);
+  remoting::SetSecurityKeyIpcChannelNameForTest(channel_name);
 
-  // Create a new Gnubby IPC Server connection.
-  auth_handler_->CreateGnubbyConnection();
+  // Create a new SecurityKey IPC Server connection.
+  auth_handler_->CreateSecurityKeyConnection();
   ASSERT_TRUE(IPC::Channel::IsNamedServerInitialized(channel_name));
 
   InitializeDesktopSessionId();
 }
 
-void GnubbyAuthHandlerWinTest::InitializeDesktopSessionId() {
+void SecurityKeyAuthHandlerWinTest::InitializeDesktopSessionId() {
   ASSERT_TRUE(
       ProcessIdToSessionId(GetCurrentProcessId(), &desktop_session_id_));
 
@@ -165,8 +165,8 @@ void GnubbyAuthHandlerWinTest::InitializeDesktopSessionId() {
       .WillByDefault(testing::Return(desktop_session_id_));
 }
 
-void GnubbyAuthHandlerWinTest::EstablishInitialIpcConnection(
-    FakeRemoteSecurityKeyIpcClient* fake_ipc_client,
+void SecurityKeyAuthHandlerWinTest::EstablishInitialIpcConnection(
+    FakeSecurityKeyIpcClient* fake_ipc_client,
     int expected_connection_id,
     const std::string& channel_name,
     bool close_connection) {
@@ -184,7 +184,7 @@ void GnubbyAuthHandlerWinTest::EstablishInitialIpcConnection(
   std::string new_channel_name = fake_ipc_client->last_message_received();
   ASSERT_FALSE(new_channel_name.empty());
 
-  // Verify the internal state of the GnubbyAuthHandler is correct.
+  // Verify the internal state of the SecurityKeyAuthHandler is correct.
   ASSERT_TRUE(auth_handler_->IsValidConnectionId(expected_connection_id));
   ASSERT_EQ(expected_connection_count,
             auth_handler_->GetActiveConnectionCountForTest());
@@ -195,51 +195,51 @@ void GnubbyAuthHandlerWinTest::EstablishInitialIpcConnection(
   }
 }
 
-void GnubbyAuthHandlerWinTest::SendRequestToGnubbyAuthHandler(
-    const base::WeakPtr<FakeRemoteSecurityKeyIpcServer>& fake_ipc_server,
+void SecurityKeyAuthHandlerWinTest::SendRequestToSecurityKeyAuthHandler(
+    const base::WeakPtr<FakeSecurityKeyIpcServer>& fake_ipc_server,
     int connection_id,
     const std::string& request_payload) {
   size_t expected_connection_count =
       auth_handler_->GetActiveConnectionCountForTest();
-  // Send a gnubby request using the fake IPC server.
+  // Send a security key request using the fake IPC server.
   fake_ipc_server->SendRequest(request_payload);
   WaitForOperationComplete();
 
-  // Verify the FakeRemoteSecurityKeyIpcServer instance was not destroyed.
+  // Verify the FakeSecurityKeyIpcServer instance was not destroyed.
   ASSERT_TRUE(fake_ipc_server.get());
 
   // Verify the request was received.
   ASSERT_EQ(connection_id, last_connection_id_received_);
   ASSERT_EQ(request_payload, last_message_received_);
 
-  // Verify the internal state of the GnubbyAuthHandler is still correct.
+  // Verify the internal state of the SecurityKeyAuthHandler is still correct.
   ASSERT_TRUE(auth_handler_->IsValidConnectionId(connection_id));
   ASSERT_EQ(expected_connection_count,
             auth_handler_->GetActiveConnectionCountForTest());
 }
 
-void GnubbyAuthHandlerWinTest::SendResponseViaGnubbyAuthHandler(
-    const base::WeakPtr<FakeRemoteSecurityKeyIpcServer>& fake_ipc_server,
+void SecurityKeyAuthHandlerWinTest::SendResponseViaSecurityKeyAuthHandler(
+    const base::WeakPtr<FakeSecurityKeyIpcServer>& fake_ipc_server,
     int connection_id,
     const std::string& response_payload) {
   size_t expected_connection_count =
       auth_handler_->GetActiveConnectionCountForTest();
 
-  // Send a gnubby response using the new IPC channel.
+  // Send a security key response using the new IPC channel.
   auth_handler_->SendClientResponse(connection_id, response_payload);
   WaitForOperationComplete();
 
-  // Verify the gnubby response was received.
+  // Verify the security key response was received.
   ASSERT_EQ(response_payload, fake_ipc_server->last_message_received());
 
-  // Verify the internal state of the GnubbyAuthHandler is still correct.
+  // Verify the internal state of the SecurityKeyAuthHandler is still correct.
   ASSERT_TRUE(auth_handler_->IsValidConnectionId(connection_id));
   ASSERT_EQ(expected_connection_count,
             auth_handler_->GetActiveConnectionCountForTest());
 }
 
-void GnubbyAuthHandlerWinTest::CloseSecurityKeySessionIpcChannel(
-    const base::WeakPtr<FakeRemoteSecurityKeyIpcServer>& fake_ipc_server,
+void SecurityKeyAuthHandlerWinTest::CloseSecurityKeySessionIpcChannel(
+    const base::WeakPtr<FakeSecurityKeyIpcServer>& fake_ipc_server,
     int connection_id) {
   size_t expected_connection_count =
       auth_handler_->GetActiveConnectionCountForTest() - 1;
@@ -251,24 +251,25 @@ void GnubbyAuthHandlerWinTest::CloseSecurityKeySessionIpcChannel(
   ASSERT_EQ(expected_connection_count,
             auth_handler_->GetActiveConnectionCountForTest());
 
-  // Verify the FakeRemoteSecurityKeyIpcServer instance was destroyed.
+  // Verify the FakeSecurityKeyIpcServer instance was destroyed.
   ASSERT_FALSE(fake_ipc_server.get());
 }
 
-std::string GnubbyAuthHandlerWinTest::GetUniqueTestChannelName() {
+std::string SecurityKeyAuthHandlerWinTest::GetUniqueTestChannelName() {
   std::string channel_name("Uber_Awesome_Super_Mega_Test_Channel.");
   channel_name.append(IPC::Channel::GenerateUniqueRandomChannelID());
 
   return channel_name;
 }
 
-TEST_F(GnubbyAuthHandlerWinTest, HandleSingleGnubbyRequest) {
+TEST_F(SecurityKeyAuthHandlerWinTest, HandleSingleSecurityKeyRequest) {
   std::string channel_name(GetUniqueTestChannelName());
-  CreateGnubbyConnection(channel_name);
+  CreateSecurityKeyConnection(channel_name);
 
   // Create a fake client and connect to the IPC server channel.
-  FakeRemoteSecurityKeyIpcClient fake_ipc_client(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  FakeSecurityKeyIpcClient fake_ipc_client(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
   EstablishInitialIpcConnection(&fake_ipc_client, kConnectionId1, channel_name,
                                 /*close_connection=*/true);
 
@@ -276,33 +277,37 @@ TEST_F(GnubbyAuthHandlerWinTest, HandleSingleGnubbyRequest) {
   std::string new_channel_name = fake_ipc_client.last_message_received();
 
   // Retrieve the IPC server instance created when the client connected.
-  base::WeakPtr<FakeRemoteSecurityKeyIpcServer> fake_ipc_server =
+  base::WeakPtr<FakeSecurityKeyIpcServer> fake_ipc_server =
       ipc_server_factory_.GetIpcServerObject(kConnectionId1);
   ASSERT_TRUE(fake_ipc_server.get());
   ASSERT_EQ(new_channel_name, fake_ipc_server->channel_name());
 
-  fake_ipc_server->set_send_response_callback(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  fake_ipc_server->set_send_response_callback(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
 
-  // Send a gnubby request using the fake IPC server.
-  SendRequestToGnubbyAuthHandler(fake_ipc_server, kConnectionId1, "0123456789");
+  // Send a security key request using the fake IPC server.
+  SendRequestToSecurityKeyAuthHandler(fake_ipc_server, kConnectionId1,
+                                      "0123456789");
 
-  // Send a gnubby response using the new IPC channel.
-  SendResponseViaGnubbyAuthHandler(fake_ipc_server, kConnectionId1,
-                                   "9876543210");
+  // Send a security key response using the new IPC channel.
+  SendResponseViaSecurityKeyAuthHandler(fake_ipc_server, kConnectionId1,
+                                        "9876543210");
 
   CloseSecurityKeySessionIpcChannel(fake_ipc_server, kConnectionId1);
 }
 
-TEST_F(GnubbyAuthHandlerWinTest, HandleConcurrentGnubbyRequests) {
+TEST_F(SecurityKeyAuthHandlerWinTest, HandleConcurrentSecurityKeyRequests) {
   std::string channel_name(GetUniqueTestChannelName());
-  CreateGnubbyConnection(channel_name);
+  CreateSecurityKeyConnection(channel_name);
 
   // Create fake clients and connect each to the IPC server channel.
-  FakeRemoteSecurityKeyIpcClient fake_ipc_client_1(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
-  FakeRemoteSecurityKeyIpcClient fake_ipc_client_2(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  FakeSecurityKeyIpcClient fake_ipc_client_1(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
+  FakeSecurityKeyIpcClient fake_ipc_client_2(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
 
   EstablishInitialIpcConnection(&fake_ipc_client_1, kConnectionId1,
                                 channel_name,
@@ -316,49 +321,52 @@ TEST_F(GnubbyAuthHandlerWinTest, HandleConcurrentGnubbyRequests) {
   std::string channel_name_2 = fake_ipc_client_2.last_message_received();
   ASSERT_NE(channel_name_1, channel_name_2);
 
-  base::WeakPtr<FakeRemoteSecurityKeyIpcServer> fake_ipc_server_1 =
+  base::WeakPtr<FakeSecurityKeyIpcServer> fake_ipc_server_1 =
       ipc_server_factory_.GetIpcServerObject(kConnectionId1);
   ASSERT_TRUE(fake_ipc_server_1.get());
   ASSERT_EQ(channel_name_1, fake_ipc_server_1->channel_name());
 
-  base::WeakPtr<FakeRemoteSecurityKeyIpcServer> fake_ipc_server_2 =
+  base::WeakPtr<FakeSecurityKeyIpcServer> fake_ipc_server_2 =
       ipc_server_factory_.GetIpcServerObject(kConnectionId2);
   ASSERT_TRUE(fake_ipc_server_2.get());
   ASSERT_EQ(channel_name_2, fake_ipc_server_2->channel_name());
 
-  fake_ipc_server_1->set_send_response_callback(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
-  fake_ipc_server_2->set_send_response_callback(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  fake_ipc_server_1->set_send_response_callback(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
+  fake_ipc_server_2->set_send_response_callback(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
 
-  // Connect and send a gnubby request using the first IPC channel.
-  SendRequestToGnubbyAuthHandler(fake_ipc_server_1, kConnectionId1,
-                                 "aaaaaaaaaa");
+  // Connect and send a security key request using the first IPC channel.
+  SendRequestToSecurityKeyAuthHandler(fake_ipc_server_1, kConnectionId1,
+                                      "aaaaaaaaaa");
 
-  // Send a gnubby request using the second IPC channel.
-  SendRequestToGnubbyAuthHandler(fake_ipc_server_1, kConnectionId1,
-                                 "bbbbbbbbbb");
+  // Send a security key request using the second IPC channel.
+  SendRequestToSecurityKeyAuthHandler(fake_ipc_server_1, kConnectionId1,
+                                      "bbbbbbbbbb");
 
-  // Send a gnubby response using the first IPC channel.
-  SendResponseViaGnubbyAuthHandler(fake_ipc_server_2, kConnectionId2,
-                                   "cccccccccc");
+  // Send a security key response using the first IPC channel.
+  SendResponseViaSecurityKeyAuthHandler(fake_ipc_server_2, kConnectionId2,
+                                        "cccccccccc");
 
-  // Send a gnubby response using the second IPC channel.
-  SendResponseViaGnubbyAuthHandler(fake_ipc_server_2, kConnectionId2,
-                                   "dddddddddd");
+  // Send a security key response using the second IPC channel.
+  SendResponseViaSecurityKeyAuthHandler(fake_ipc_server_2, kConnectionId2,
+                                        "dddddddddd");
 
   // Close the IPC channels.
   CloseSecurityKeySessionIpcChannel(fake_ipc_server_1, kConnectionId1);
   CloseSecurityKeySessionIpcChannel(fake_ipc_server_2, kConnectionId2);
 }
 
-TEST_F(GnubbyAuthHandlerWinTest, HandleSequentialGnubbyRequests) {
+TEST_F(SecurityKeyAuthHandlerWinTest, HandleSequentialSecurityKeyRequests) {
   std::string channel_name(GetUniqueTestChannelName());
-  CreateGnubbyConnection(channel_name);
+  CreateSecurityKeyConnection(channel_name);
 
   // Create fake clients to connect to the IPC server channel.
-  FakeRemoteSecurityKeyIpcClient fake_ipc_client_1(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  FakeSecurityKeyIpcClient fake_ipc_client_1(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
 
   EstablishInitialIpcConnection(&fake_ipc_client_1, kConnectionId1,
                                 channel_name,
@@ -367,28 +375,30 @@ TEST_F(GnubbyAuthHandlerWinTest, HandleSequentialGnubbyRequests) {
   // Verify the connection details have been passed to the client.
   std::string channel_name_1 = fake_ipc_client_1.last_message_received();
 
-  base::WeakPtr<FakeRemoteSecurityKeyIpcServer> fake_ipc_server_1 =
+  base::WeakPtr<FakeSecurityKeyIpcServer> fake_ipc_server_1 =
       ipc_server_factory_.GetIpcServerObject(kConnectionId1);
   ASSERT_TRUE(fake_ipc_server_1.get());
   ASSERT_EQ(channel_name_1, fake_ipc_server_1->channel_name());
 
-  fake_ipc_server_1->set_send_response_callback(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  fake_ipc_server_1->set_send_response_callback(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
 
-  // Send a gnubby request using the first IPC channel.
-  SendRequestToGnubbyAuthHandler(fake_ipc_server_1, kConnectionId1,
-                                 "aaaaaaaaaa");
+  // Send a security key request using the first IPC channel.
+  SendRequestToSecurityKeyAuthHandler(fake_ipc_server_1, kConnectionId1,
+                                      "aaaaaaaaaa");
 
-  // Send a gnubby response using the first IPC channel.
-  SendResponseViaGnubbyAuthHandler(fake_ipc_server_1, kConnectionId1,
-                                   "cccccccccc");
+  // Send a security key response using the first IPC channel.
+  SendResponseViaSecurityKeyAuthHandler(fake_ipc_server_1, kConnectionId1,
+                                        "cccccccccc");
 
   // Close the IPC channel.
   CloseSecurityKeySessionIpcChannel(fake_ipc_server_1, kConnectionId1);
 
   // Now connect with a second client.
-  FakeRemoteSecurityKeyIpcClient fake_ipc_client_2(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  FakeSecurityKeyIpcClient fake_ipc_client_2(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
   EstablishInitialIpcConnection(&fake_ipc_client_2, kConnectionId2,
                                 channel_name,
                                 /*close_connection=*/true);
@@ -396,42 +406,45 @@ TEST_F(GnubbyAuthHandlerWinTest, HandleSequentialGnubbyRequests) {
   std::string channel_name_2 = fake_ipc_client_2.last_message_received();
   ASSERT_NE(channel_name_1, channel_name_2);
 
-  base::WeakPtr<FakeRemoteSecurityKeyIpcServer> fake_ipc_server_2 =
+  base::WeakPtr<FakeSecurityKeyIpcServer> fake_ipc_server_2 =
       ipc_server_factory_.GetIpcServerObject(kConnectionId2);
   ASSERT_TRUE(fake_ipc_server_2.get());
   ASSERT_EQ(channel_name_2, fake_ipc_server_2->channel_name());
 
-  fake_ipc_server_2->set_send_response_callback(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  fake_ipc_server_2->set_send_response_callback(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
 
-  // Send a gnubby request using the second IPC channel.
-  SendRequestToGnubbyAuthHandler(fake_ipc_server_2, kConnectionId2,
-                                 "bbbbbbbbbb");
+  // Send a security key request using the second IPC channel.
+  SendRequestToSecurityKeyAuthHandler(fake_ipc_server_2, kConnectionId2,
+                                      "bbbbbbbbbb");
 
-  // Send a gnubby response using the second IPC channel.
-  SendResponseViaGnubbyAuthHandler(fake_ipc_server_2, kConnectionId2,
-                                   "dddddddddd");
+  // Send a security key response using the second IPC channel.
+  SendResponseViaSecurityKeyAuthHandler(fake_ipc_server_2, kConnectionId2,
+                                        "dddddddddd");
 
   // Close the IPC channel.
   CloseSecurityKeySessionIpcChannel(fake_ipc_server_2, kConnectionId2);
 }
 
-TEST_F(GnubbyAuthHandlerWinTest, ClientNeverDisconnectsFromInitialIpcChannel) {
+TEST_F(SecurityKeyAuthHandlerWinTest,
+       ClientNeverDisconnectsFromInitialIpcChannel) {
   const int kLowConnectionTimeoutInMs = 25;
   auth_handler_->SetRequestTimeoutForTest(
       base::TimeDelta::FromMilliseconds(kLowConnectionTimeoutInMs));
 
   std::string channel_name(GetUniqueTestChannelName());
-  CreateGnubbyConnection(channel_name);
+  CreateSecurityKeyConnection(channel_name);
 
   // Create a fake client and connect to the IPC server channel.
-  FakeRemoteSecurityKeyIpcClient fake_ipc_client(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  FakeSecurityKeyIpcClient fake_ipc_client(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
   EstablishInitialIpcConnection(&fake_ipc_client, kConnectionId1, channel_name,
                                 /*close_connection=*/false);
 
-  // Don't close the channel here, instead wait for the GnubbyAuthHandler to
-  // close the connection due to the timeout.
+  // Don't close the channel here, instead wait for the SecurityKeyAuthHandler
+  // to close the connection due to the timeout.
   WaitForOperationComplete();
 
   // Verify the connection that was set up still exists.
@@ -443,13 +456,14 @@ TEST_F(GnubbyAuthHandlerWinTest, ClientNeverDisconnectsFromInitialIpcChannel) {
                                 /*close_connection=*/true);
 }
 
-TEST_F(GnubbyAuthHandlerWinTest, HandleGnubbyRequestTimeout) {
+TEST_F(SecurityKeyAuthHandlerWinTest, HandleSecurityKeyRequestTimeout) {
   std::string channel_name(GetUniqueTestChannelName());
-  CreateGnubbyConnection(channel_name);
+  CreateSecurityKeyConnection(channel_name);
 
   // Create a fake client and connect to the IPC server channel.
-  FakeRemoteSecurityKeyIpcClient fake_ipc_client(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  FakeSecurityKeyIpcClient fake_ipc_client(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
   EstablishInitialIpcConnection(&fake_ipc_client, kConnectionId1, channel_name,
                                 /*close_connection=*/true);
 
@@ -457,13 +471,14 @@ TEST_F(GnubbyAuthHandlerWinTest, HandleGnubbyRequestTimeout) {
   std::string new_channel_name = fake_ipc_client.last_message_received();
 
   // Retrieve the IPC server instance created when the client connected.
-  base::WeakPtr<FakeRemoteSecurityKeyIpcServer> fake_ipc_server =
+  base::WeakPtr<FakeSecurityKeyIpcServer> fake_ipc_server =
       ipc_server_factory_.GetIpcServerObject(kConnectionId1);
   ASSERT_TRUE(fake_ipc_server.get());
   ASSERT_EQ(new_channel_name, fake_ipc_server->channel_name());
 
-  fake_ipc_server->set_send_response_callback(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  fake_ipc_server->set_send_response_callback(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
 
   // Simulate a timeout and verify the IPC server is cleaned up.
   CloseSecurityKeySessionIpcChannel(fake_ipc_server, kConnectionId1);
@@ -473,13 +488,14 @@ TEST_F(GnubbyAuthHandlerWinTest, HandleGnubbyRequestTimeout) {
                                 /*close_connection=*/true);
 }
 
-TEST_F(GnubbyAuthHandlerWinTest, HandleGnubbyErrorResponse) {
+TEST_F(SecurityKeyAuthHandlerWinTest, HandleSecurityKeyErrorResponse) {
   std::string channel_name(GetUniqueTestChannelName());
-  CreateGnubbyConnection(channel_name);
+  CreateSecurityKeyConnection(channel_name);
 
   // Create a fake client and connect to the IPC server channel.
-  FakeRemoteSecurityKeyIpcClient fake_ipc_client(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  FakeSecurityKeyIpcClient fake_ipc_client(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
   EstablishInitialIpcConnection(&fake_ipc_client, kConnectionId1, channel_name,
                                 /*close_connection=*/true);
 
@@ -487,18 +503,20 @@ TEST_F(GnubbyAuthHandlerWinTest, HandleGnubbyErrorResponse) {
   std::string new_channel_name = fake_ipc_client.last_message_received();
 
   // Retrieve the IPC server instance created when the client connected.
-  base::WeakPtr<FakeRemoteSecurityKeyIpcServer> fake_ipc_server =
+  base::WeakPtr<FakeSecurityKeyIpcServer> fake_ipc_server =
       ipc_server_factory_.GetIpcServerObject(kConnectionId1);
   ASSERT_TRUE(fake_ipc_server.get());
   ASSERT_EQ(new_channel_name, fake_ipc_server->channel_name());
 
-  fake_ipc_server->set_send_response_callback(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  fake_ipc_server->set_send_response_callback(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
 
-  // Send a gnubby request using the fake IPC server.
-  SendRequestToGnubbyAuthHandler(fake_ipc_server, kConnectionId1, "0123456789");
+  // Send a security key request using the fake IPC server.
+  SendRequestToSecurityKeyAuthHandler(fake_ipc_server, kConnectionId1,
+                                      "0123456789");
 
-  // Simulate a gnubby error from the client.
+  // Simulate a security key error from the client.
   auth_handler_->SendErrorAndCloseConnection(kConnectionId1);
   // Wait for the ipc server channel to be torn down.
   WaitForOperationComplete();
@@ -513,16 +531,17 @@ TEST_F(GnubbyAuthHandlerWinTest, HandleGnubbyErrorResponse) {
                                 /*close_connection=*/true);
 }
 
-TEST_F(GnubbyAuthHandlerWinTest, IpcConnectionFailsFromInvalidSession) {
+TEST_F(SecurityKeyAuthHandlerWinTest, IpcConnectionFailsFromInvalidSession) {
   std::string channel_name(GetUniqueTestChannelName());
-  CreateGnubbyConnection(channel_name);
+  CreateSecurityKeyConnection(channel_name);
 
   // Set the current session id to a 'different' session.
   desktop_session_id_ += 1;
 
   // Create a fake client and connect to the IPC server channel.
-  FakeRemoteSecurityKeyIpcClient fake_ipc_client(base::Bind(
-      &GnubbyAuthHandlerWinTest::OperationComplete, base::Unretained(this)));
+  FakeSecurityKeyIpcClient fake_ipc_client(
+      base::Bind(&SecurityKeyAuthHandlerWinTest::OperationComplete,
+                 base::Unretained(this)));
   ASSERT_TRUE(fake_ipc_client.ConnectViaIpc(channel_name));
   // Wait for the error callback to be signaled.
   WaitForOperationComplete();