[Chromoting.com] Make Android telemetry report host version/os/os version

remoting/base/chromoting_event.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/base/chromoting_event.h"
 
+#include "base/strings/string_util.h"
 #include "base/strings/stringize_macros.h"
 #include "base/sys_info.h"
 
 namespace remoting {
 
 const char ChromotingEvent::kCaptureLatencyKey[] = "capture_latency";
 const char ChromotingEvent::kConnectionErrorKey[] = "connection_error";
 const char ChromotingEvent::kCpuKey[] = "cpu";
 const char ChromotingEvent::kDecodeLatencyKey[] = "decode_latency";
 const char ChromotingEvent::kEncodeLatencyKey[] = "encode_latency";
+const char ChromotingEvent::kHostOsKey[] = "host_os";
+const char ChromotingEvent::kHostOsVersionKey[] = "host_os_version";
+const char ChromotingEvent::kHostVersionKey[] = "host_version";
 const char ChromotingEvent::kMaxCaptureLatencyKey[] = "max_capture_latency";
 const char ChromotingEvent::kMaxDecodeLatencyKey[] = "max_decode_latency";
 const char ChromotingEvent::kMaxEncodeLatencyKey[] = "max_encode_latency";
 const char ChromotingEvent::kMaxRenderLatencyKey[] = "max_render_latency";
 const char ChromotingEvent::kMaxRoundtripLatencyKey[] = "max_roundtrip_latency";
 const char ChromotingEvent::kModeKey[] = "mode";
 const char ChromotingEvent::kOsKey[] = "os";
 const char ChromotingEvent::kOsVersionKey[] = "os_version";
 const char ChromotingEvent::kRenderLatencyKey[] = "render_latency";
 const char ChromotingEvent::kRoleKey[] = "role";
@@ skipping 86 matching lines @@
 }
 
 // static
 bool ChromotingEvent::IsEndOfSession(SessionState state) {
   return state == SessionState::CLOSED ||
          state == SessionState::CONNECTION_DROPPED ||
          state == SessionState::CONNECTION_FAILED ||
          state == SessionState::CONNECTION_CANCELED;
 }
 
+// static
+ChromotingEvent::Os ChromotingEvent::ParseOsFromString(const std::string& os) {
+  std::string lower_os = base::ToLowerASCII(os);
+  if (lower_os == "linux") {

[Sergey Ulanov, 2017/01/13 02:15:26]

FYI there are helpers in remoting/protocol/name_value_map.h that could be used
to make this logic simpler and less error-prone. But it would have to be moved
to base to be used here.

[Yuwei, 2017/01/13 02:27:21]

Good to know! Left a TODO and will do it this is checked in.

+    return Os::CHROMOTING_LINUX;
+  } else if (lower_os == "chromeos") {
+    return Os::CHROMOTING_CHROMEOS;
+  } else if (lower_os == "mac") {
+    return Os::CHROMOTING_MAC;
+  } else if (lower_os == "windows") {
+    return Os::CHROMOTING_WINDOWS;
+  } else if (lower_os == "android") {
+    return Os::CHROMOTING_ANDROID;
+  } else if (lower_os == "ios") {
+    return Os::CHROMOTING_IOS;
+  }
+  return Os::OTHER;
+}
+
 }  // namespace remoting