| Index: remoting/host/security_key/security_key_ipc_constants.cc
|
| diff --git a/remoting/host/security_key/remote_security_key_ipc_constants.cc b/remoting/host/security_key/security_key_ipc_constants.cc
|
| similarity index 47%
|
| rename from remoting/host/security_key/remote_security_key_ipc_constants.cc
|
| rename to remoting/host/security_key/security_key_ipc_constants.cc
|
| index b3b5234e2d58fa9dd3bb2b5aa61f1fc66900d21d..e9aeb8685750951c6d5d1ea5598e9240d23c27da 100644
|
| --- a/remoting/host/security_key/remote_security_key_ipc_constants.cc
|
| +++ b/remoting/host/security_key/security_key_ipc_constants.cc
|
| @@ -2,37 +2,33 @@
|
| // 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_constants.h"
|
| +#include "remoting/host/security_key/security_key_ipc_constants.h"
|
|
|
| #include "base/environment.h"
|
| #include "base/lazy_instance.h"
|
|
|
| namespace {
|
| -base::LazyInstance<std::string> g_remote_security_key_ipc_channel_name =
|
| +base::LazyInstance<std::string> g_security_key_ipc_channel_name =
|
| LAZY_INSTANCE_INITIALIZER;
|
|
|
| -const char kRemoteSecurityKeyIpcChannelName[] =
|
| - "remote_security_key_ipc_channel";
|
| +const char kSecurityKeyIpcChannelName[] = "security_key_ipc_channel";
|
|
|
| } // namespace
|
|
|
| namespace remoting {
|
|
|
| -extern const char kRemoteSecurityKeyConnectionError[] =
|
| - "remote_ssh_connection_error";
|
| +extern const char kSecurityKeyConnectionError[] = "ssh_connection_error";
|
|
|
| -const std::string& GetRemoteSecurityKeyIpcChannelName() {
|
| - if (g_remote_security_key_ipc_channel_name.Get().empty()) {
|
| - g_remote_security_key_ipc_channel_name.Get() =
|
| - kRemoteSecurityKeyIpcChannelName;
|
| +const std::string& GetSecurityKeyIpcChannelName() {
|
| + if (g_security_key_ipc_channel_name.Get().empty()) {
|
| + g_security_key_ipc_channel_name.Get() = kSecurityKeyIpcChannelName;
|
| }
|
|
|
| - return g_remote_security_key_ipc_channel_name.Get();
|
| + return g_security_key_ipc_channel_name.Get();
|
| }
|
|
|
| -void SetRemoteSecurityKeyIpcChannelNameForTest(
|
| - const std::string& channel_name) {
|
| - g_remote_security_key_ipc_channel_name.Get() = channel_name;
|
| +void SetSecurityKeyIpcChannelNameForTest(const std::string& channel_name) {
|
| + g_security_key_ipc_channel_name.Get() = channel_name;
|
| }
|
|
|
| std::string GetChannelNamePathPrefixForTest() {
|
|
|