[Tracing] Set os-name to CrOS in trace metadata, and get the correct version for it

content/browser/tracing/tracing_controller_impl.cc

 // Copyright (c) 2013 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 "content/browser/tracing/tracing_controller_impl.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 819 matching lines @@
   // need filtering in some cases.
   std::unique_ptr<base::DictionaryValue> metadata_dict(
       new base::DictionaryValue());
 
   metadata_dict->SetString("network-type", GetNetworkTypeString());
   metadata_dict->SetString("product-version", GetContentClient()->GetProduct());
   metadata_dict->SetString("v8-version", V8_VERSION_STRING);
   metadata_dict->SetString("user-agent", GetContentClient()->GetUserAgent());
 
   // OS
+#if defined(OS_CHROMEOS)
+  metadata_dict->SetString("os-name", "CrOS");
+  int32_t major_version;
+  int32_t minor_version;
+  int32_t bugfix_version;
+  // OperatingSystemVersion on has a POSIX implementation which returns the

[oystein (OOO til 10th of July), 2017/04/27 21:05:16]

-on?

[fmeawad, 2017/04/27 21:17:25]

Done.

+  // wrong versions for CrOS.
+  base::SysInfo::OperatingSystemVersionNumbers(&major_version, &minor_version,
+                                               &bugfix_version);
+  metadata_dict->SetString(
+      "os-version", base::StringPrintf("%d.%d.%d", major_version, minor_version,
+                                       bugfix_version));
+#else
   metadata_dict->SetString("os-name", base::SysInfo::OperatingSystemName());
   metadata_dict->SetString("os-version",
                            base::SysInfo::OperatingSystemVersion());
+#endif
   metadata_dict->SetString("os-arch",
                            base::SysInfo::OperatingSystemArchitecture());
 
   // CPU
   base::CPU cpu;
   metadata_dict->SetInteger("cpu-family", cpu.family());
   metadata_dict->SetInteger("cpu-model", cpu.model());
   metadata_dict->SetInteger("cpu-stepping", cpu.stepping());
   metadata_dict->SetInteger("num-cpus", base::SysInfo::NumberOfProcessors());
   metadata_dict->SetInteger("physical-memory",
@@ skipping 63 matching lines @@
 void TracingControllerImpl::RemoveTraceMessageFilterObserver(
     TraceMessageFilterObserver* observer) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   trace_message_filter_observers_.RemoveObserver(observer);
 
   for (auto& filter : trace_message_filters_)
     observer->OnTraceMessageFilterRemoved(filter.get());
 }
 
 }  // namespace content