Move ChromeOS hardware class init out of MetricsService.

chrome/browser/metrics/metrics_log.cc

 // 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.
 
 #include "chrome/browser/metrics/metrics_log.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 323 matching lines @@
   // Reduce granularity of the enabled_date field to nearest hour.
   system_profile->set_uma_enabled_date(RoundSecondsToHour(enabled_date));
 
   int64 install_date = local_state_->GetInt64(prefs::kInstallDate);
 
   // Reduce granularity of the install_date field to nearest hour.
   system_profile->set_install_date(RoundSecondsToHour(install_date));
 
   system_profile->set_application_locale(client_->GetApplicationLocale());
 
+  // By default, the hardware class is empty (i.e., unknown).
+  uma_proto()->mutable_system_profile()->mutable_hardware()->set_hardware_class(

[Alexei Svitkine (slow), 2014/05/28 18:45:57]

Nit: you have a |hardware| section just below this, just use that.

[blundell, 2014/05/28 18:59:49]

Done.

+      std::string());
+
   SystemProfileProto::Hardware* hardware = system_profile->mutable_hardware();
   hardware->set_cpu_architecture(base::SysInfo::OperatingSystemArchitecture());
   hardware->set_system_ram_mb(base::SysInfo::AmountOfPhysicalMemoryMB());
 #if defined(OS_WIN)
   hardware->set_dll_base(reinterpret_cast<uint64>(&__ImageBase));
 #endif
 
   SystemProfileProto::OS* os = system_profile->mutable_os();
   std::string os_name = base::SysInfo::OperatingSystemName();
 #if defined(OS_WIN)
@@ skipping 73 matching lines @@
     profile = uma_proto()->add_profiler_event();
     profile->set_profile_type(ProfilerEventProto::STARTUP_PROFILE);
     profile->set_time_source(ProfilerEventProto::WALL_CLOCK_TIME);
   } else {
     // For the remaining calls, re-use the existing field.
     profile = uma_proto()->mutable_profiler_event(0);
   }
 
   WriteProfilerData(process_data, process_type, profile);
 }