Revert of Renaming Gnubby and RemoteSecurityKey files/classes/members

remoting/host/remoting_me2me_host.cc

Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 322ff25ae2e03e7b8996da021bfc138fa06beb8f..3c1d98630d0be81e278602d82b08d6f92ad848ba 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -72,8 +72,8 @@
 #include "remoting/host/pairing_registry_delegate.h"
 #include "remoting/host/pin_hash.h"
 #include "remoting/host/policy_watcher.h"
-#include "remoting/host/security_key/security_key_auth_handler.h"
-#include "remoting/host/security_key/security_key_extension.h"
+#include "remoting/host/security_key/gnubby_auth_handler.h"
+#include "remoting/host/security_key/gnubby_extension.h"
 #include "remoting/host/service_urls.h"
 #include "remoting/host/shutdown_watchdog.h"
 #include "remoting/host/signaling_connector.h"
@@ -151,7 +151,7 @@
 const char kAudioPipeSwitchName[] = "audio-pipe-name";
 
 // The command line switch used to pass name of the unix domain socket used to
-// listen for security key requests.
+// listen for gnubby requests.
 const char kAuthSocknameSwitchName[] = "ssh-auth-sockname";
 #endif  // defined(OS_LINUX)
 
@@ -374,8 +374,8 @@
 
   bool curtain_required_ = false;
   ThirdPartyAuthConfig third_party_auth_config_;
-  bool security_key_auth_policy_enabled_ = false;
-  bool security_key_extension_supported_ = false;
+  bool gnubby_auth_policy_enabled_ = false;
+  bool gnubby_extension_supported_ = false;
 
   // Boolean to change flow, where necessary, if we're
   // capturing a window instead of the entire desktop.
@@ -816,17 +816,15 @@
         context_->audio_task_runner(), audio_pipe_name);
   }
 
-  base::FilePath security_key_socket_name =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
-          kAuthSocknameSwitchName);
-  if (!security_key_socket_name.empty()) {
-    remoting::SecurityKeyAuthHandler::SetSecurityKeySocketName(
-        security_key_socket_name);
-    security_key_extension_supported_ = true;
+  base::FilePath gnubby_socket_name = base::CommandLine::ForCurrentProcess()->
+      GetSwitchValuePath(kAuthSocknameSwitchName);
+  if (!gnubby_socket_name.empty()) {
+    remoting::GnubbyAuthHandler::SetGnubbySocketName(gnubby_socket_name);
+    gnubby_extension_supported_ = true;
   }
 #elif defined(OS_WIN)
   // TODO(joedow): Remove the conditional once this is supported on OSX.
-  security_key_extension_supported_ = true;
+  gnubby_extension_supported_ = true;
 #endif  // defined(OS_WIN)
 
   // Create a desktop environment factory appropriate to the build type &
@@ -1319,14 +1317,14 @@
   DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
 
   if (!policies->GetBoolean(policy::key::kRemoteAccessHostAllowGnubbyAuth,
-                            &security_key_auth_policy_enabled_)) {
+                            &gnubby_auth_policy_enabled_)) {
     return false;
   }
 
-  if (security_key_auth_policy_enabled_) {
-    HOST_LOG << "Policy enables security key auth.";
+  if (gnubby_auth_policy_enabled_) {
+    HOST_LOG << "Policy enables gnubby auth.";
   } else {
-    HOST_LOG << "Policy disables security key auth.";
+    HOST_LOG << "Policy disables gnubby auth.";
   }
 
   return true;
@@ -1460,8 +1458,8 @@
                                  context_->audio_task_runner(),
                                  context_->video_encode_task_runner()));
 
-  if (security_key_auth_policy_enabled_ && security_key_extension_supported_) {
-    host_->AddExtension(base::WrapUnique(new SecurityKeyExtension()));
+  if (gnubby_auth_policy_enabled_ && gnubby_extension_supported_) {
+    host_->AddExtension(base::WrapUnique(new GnubbyExtension()));
   }
 
   // TODO(simonmorris): Get the maximum session duration from a policy.