[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 "base/bind.h"
 #include "base/cpu.h"
 #include "base/files/file_util.h"
 #include "base/guid.h"
 #include "base/json/string_escape.h"
@@ skipping 99 matching lines @@
 
 std::unique_ptr<base::DictionaryValue> GenerateTracingMetadataDict() {
   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("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;
+  base::SysInfo::OperatingSystemVersionNumbers(&major_version, &minor_version,

[oystein (OOO til 10th of July), 2016/06/19 08:59:44]

What's the functional difference between setting os-version like this, and the
base::SysInfo::OperatingSystemVersion() below? A comment explaining why would
probably be good :).

+                                               &bugfix_version);
+  metadata_dict->SetString(
+      "os-version", base::StringPrintf("%d.%d.%d", major_version, minor_version,
+                                       bugfix_version));
+#elif

[oystein (OOO til 10th of July), 2016/06/19 08:59:44]

#else i guess :)

   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 896 matching lines @@
   const bool global_success = failed_memory_dump_count_ == 0;
   if (!pending_memory_dump_callback_.is_null()) {
     pending_memory_dump_callback_.Run(pending_memory_dump_guid_,
                                       global_success);
     pending_memory_dump_callback_.Reset();
   }
   pending_memory_dump_guid_ = 0;
 }
 
 }  // namespace content