Clean up remaining unused globals (on mac).

remoting/host/server_log_entry.cc

 // Copyright (c) 2012 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/server_log_entry.h"
 
 #include "base/logging.h"
 #include "base/strings/stringize_macros.h"
 #include "base/sys_info.h"
 #include "remoting/base/constants.h"
@@ skipping 25 matching lines @@
 const char kValueModeMe2Me[] = "me2me";
 
 const char kKeySessionState[] = "session-state";
 const char kValueSessionStateConnected[] = "connected";
 const char kValueSessionStateClosed[] = "closed";
 
 const char kStatusName[] = "status";
 const char kExitCodeName[] = "exit-code";
 
 const char kKeyOsName[] = "os-name";
-const char kValueOsNameWindows[] = "Windows";
-const char kValueOsNameLinux[] = "Linux";
-const char kValueOsNameMac[] = "Mac";
-const char kValueOsNameChromeOS[] = "ChromeOS";
 
 const char kKeyOsVersion[] = "os-version";
 
 const char kKeyHostVersion[] = "host-version";
 
 const char kKeyCpu[] = "cpu";
 
 const char kKeyConnectionType[] = "connection-type";
 
 }  // namespace
@@ skipping 35 matching lines @@
   entry->Set(kKeyRole, kValueRoleHost);
   entry->Set(kKeyEventName, kValueEventNameHostStatus);
   entry->Set(kStatusName, HostStatusSender::HostStatusToString(host_status));
   if (host_status == HostStatusSender::OFFLINE)
     entry->Set(kExitCodeName, ExitCodeToString(exit_code));
   return entry.Pass();
 }
 
 void ServerLogEntry::AddHostFields() {
 #if defined(OS_WIN)
-  Set(kKeyOsName, kValueOsNameWindows);
+  Set(kKeyOsName, "Windows");
 #elif defined(OS_MACOSX)
-  Set(kKeyOsName, kValueOsNameMac);
+  Set(kKeyOsName, "Mac");
 #elif defined(OS_CHROMEOS)
-  Set(kKeyOsName, kValueOsNameChromeOS);
+  Set(kKeyOsName, "ChromeOS");
 #elif defined(OS_LINUX)
-  Set(kKeyOsName, kValueOsNameLinux);
+  Set(kKeyOsName, "Linux");
 #endif
 
   // SysInfo::OperatingSystemVersionNumbers is only defined for the following
   // OSes: see base/sys_info_unittest.cc.
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
   std::stringstream os_version;
   int32 os_major_version = 0;
   int32 os_minor_version = 0;
   int32 os_bugfix_version = 0;
   SysInfo::OperatingSystemVersionNumbers(&os_major_version, &os_minor_version,
@@ skipping 42 matching lines @@
 // static
 const char* ServerLogEntry::GetValueSessionState(bool connected) {
   return connected ? kValueSessionStateConnected : kValueSessionStateClosed;
 }
 
 void ServerLogEntry::Set(const std::string& key, const std::string& value) {
   values_map_[key] = value;
 }
 
 }  // namespace remoting