[Chromoting] Fix os detection logic in logs.

remoting/webapp/base/js/server_log_entry.js

 // 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.
 
 /**
  * @fileoverview
  * A class of server log entries.
  *
  * Any changes to the values here need to be coordinated with the host and
  * server/log proto code.
@@ skipping 121 matching lines @@
 remoting.ServerLogEntry.KEY_ENCODE_LATENCY_ = "encode-latency";
 /** @private */
 remoting.ServerLogEntry.KEY_DECODE_LATENCY_ = "decode-latency";
 /** @private */
 remoting.ServerLogEntry.KEY_RENDER_LATENCY_ = "render-latency";
 /** @private */
 remoting.ServerLogEntry.KEY_ROUNDTRIP_LATENCY_ = "roundtrip-latency";
 
 /** @private */
 remoting.ServerLogEntry.KEY_OS_NAME_ = 'os-name';
-/** @private */
-remoting.ServerLogEntry.VALUE_OS_NAME_WINDOWS_ = 'Windows';
-/** @private */
-remoting.ServerLogEntry.VALUE_OS_NAME_LINUX_ = 'Linux';
-/** @private */
-remoting.ServerLogEntry.VALUE_OS_NAME_MAC_ = 'Mac';
-/** @private */
-remoting.ServerLogEntry.VALUE_OS_NAME_CHROMEOS_ = 'ChromeOS';
 
 /** @private */
 remoting.ServerLogEntry.KEY_OS_VERSION_ = 'os-version';
 
 /** @private */
 remoting.ServerLogEntry.KEY_CPU_ = 'cpu';
 
 /** @private */
 remoting.ServerLogEntry.KEY_BROWSER_VERSION_ = 'browser-version';
 
@@ skipping 210 matching lines @@
  * @param {string} sessionId
  */
 remoting.ServerLogEntry.prototype.addSessionIdField = function(sessionId) {
   this.set_(remoting.ServerLogEntry.KEY_SESSION_ID_, sessionId);
 }
 
 /**
  * Adds fields describing the host to this log entry.
  */
 remoting.ServerLogEntry.prototype.addClientOSFields = function() {
-  var host = remoting.ServerLogEntry.getHostData_();
+  var host = remoting.getSystemInfo();

[Jamie, 2015/06/06 01:05:41]

This is a confusing name, given that the containing method refers to "client". I
suggest just calling it systemInfo.

[kelvinp, 2015/06/06 02:09:55]

Done.

   if (host) {
     if (host.os_name.length > 0) {
       this.set_(remoting.ServerLogEntry.KEY_OS_NAME_, host.os_name);
     }
     if (host.os_version.length > 0) {
       this.set_(remoting.ServerLogEntry.KEY_OS_VERSION_, host.os_version);
     }
     if (host.cpu.length > 0) {
       this.set_(remoting.ServerLogEntry.KEY_CPU_, host.cpu);
     }
   }
 };
 
 /**
- * Extracts host data from the userAgent string.
- *
- * @private
- * @return {{os_name:string, os_version:string, cpu:string} | null}
- */
-remoting.ServerLogEntry.getHostData_ = function() {
-  return remoting.ServerLogEntry.extractHostDataFrom_(navigator.userAgent);
-};
-
-/**
- * Extracts host data from the given userAgent string.
- *
- * @private
- * @param {string} s
- * @return {{os_name:string, os_version:string, cpu:string} | null}
- */
-remoting.ServerLogEntry.extractHostDataFrom_ = function(s) {
-  // Sample userAgent strings:
-  // 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.2 ' +
-  //   '(KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2'
-  // 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.8 ' +
-  //   '(KHTML, like Gecko) Chrome/17.0.933.0 Safari/535.8'
-  // 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.1 ' +
-  //   '(KHTML, like Gecko) Chrome/14.0.835.202 Safari/535.1'
-  // 'Mozilla/5.0 (X11; CrOS i686 14.811.154) AppleWebKit/535.1 ' +
-  //   '(KHTML, like Gecko) Chrome/14.0.835.204 Safari/535.1'
-  var match = new RegExp('Windows NT ([0-9\\.]*)').exec(s);
-  if (match && (match.length >= 2)) {
-    return {
-        'os_name': remoting.ServerLogEntry.VALUE_OS_NAME_WINDOWS_,
-        'os_version': match[1],
-        'cpu': ''
-    };
-  }
-  match = new RegExp('Linux ([a-zA-Z0-9_]*)').exec(s);
-  if (match && (match.length >= 2)) {
-    return {
-        'os_name': remoting.ServerLogEntry.VALUE_OS_NAME_LINUX_,
-        'os_version' : '',
-        'cpu': match[1]
-    };
-  }
-  match = new RegExp('([a-zA-Z]*) Mac OS X ([0-9_]*)').exec(s);
-  if (match && (match.length >= 3)) {
-    return {
-        'os_name': remoting.ServerLogEntry.VALUE_OS_NAME_MAC_,
-        'os_version': match[2].replace(/_/g, '.'),
-        'cpu': match[1]
-    };
-  }
-  match = new RegExp('CrOS ([a-zA-Z0-9]*) ([0-9.]*)').exec(s);
-  if (match && (match.length >= 3)) {
-    return {
-        'os_name': remoting.ServerLogEntry.VALUE_OS_NAME_CHROMEOS_,
-        'os_version': match[2],
-        'cpu': match[1]
-    };
-  }
-  return null;
-};
-
-/**
  * Adds a field to this log entry specifying the time in seconds since the start
  * of the session to the current event.
  * @param {number} sessionDurationInSeconds
  */
 remoting.ServerLogEntry.prototype.addSessionDuration =
     function(sessionDurationInSeconds) {
   this.set_(remoting.ServerLogEntry.KEY_SESSION_DURATION_SECONDS_,
             String(sessionDurationInSeconds));
 };
 
@@ skipping 36 matching lines @@
 };
 
 /**
  * Adds a field specifying the application ID to this log entry.
  * @return {void} Nothing.
  */
 remoting.ServerLogEntry.prototype.addApplicationId = function() {
   this.set_(remoting.ServerLogEntry.KEY_APP_ID_, chrome.runtime.id);
 };