Move name_value_map to remoting/base

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"
+#include "remoting/base/name_value_map.h"
 
 namespace remoting {
 
+namespace {
+
+const NameMapElement<ChromotingEvent::Os> kOsNames[] = {
+    {ChromotingEvent::Os::CHROMOTING_LINUX, "linux"},
+    {ChromotingEvent::Os::CHROMOTING_CHROMEOS, "chromeos"},
+    {ChromotingEvent::Os::CHROMOTING_MAC, "mac"},
+    {ChromotingEvent::Os::CHROMOTING_WINDOWS, "windows"},
+    {ChromotingEvent::Os::CHROMOTING_ANDROID, "android"},
+    {ChromotingEvent::Os::CHROMOTING_IOS, "ios"},
+};
+
+}  // namespace
+
 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";
@@ skipping 96 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);
-  // TODO(yuweih): Refactor remoting/protocol/name_value_map.h and use it to
-  //     map the value.
-  if (lower_os == "linux") {
-    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;
+  ChromotingEvent::Os result;
+  if (!NameToValue(kOsNames, base::ToLowerASCII(os), &result)) {
+    return Os::OTHER;
   }
-  return Os::OTHER;
+
+  return result;
 }
 
 }  // namespace remoting