diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 13:57:45 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-19 13:44:40 +0000 |
commit | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch) | |
tree | b87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/components/metrics/metrics_log.cc | |
parent | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff) | |
download | qtwebengine-chromium-6ec7b8da05d21a3878bd21c691b41e675d74bb1c.tar.gz |
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/metrics/metrics_log.cc')
-rw-r--r-- | chromium/components/metrics/metrics_log.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chromium/components/metrics/metrics_log.cc b/chromium/components/metrics/metrics_log.cc index 42331e3f15b..ac35ce396a3 100644 --- a/chromium/components/metrics/metrics_log.cc +++ b/chromium/components/metrics/metrics_log.cc @@ -151,7 +151,12 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServiceClient* client, metrics::SystemProfileProto::Hardware* hardware = system_profile->mutable_hardware(); +#if !defined(OS_IOS) + // On iOS, OperatingSystemArchitecture() returns values like iPad4,4 which is + // not the actual CPU architecture. Don't set it until the API is fixed. See + // crbug.com/370104 for details. hardware->set_cpu_architecture(base::SysInfo::OperatingSystemArchitecture()); +#endif hardware->set_system_ram_mb(base::SysInfo::AmountOfPhysicalMemoryMB()); hardware->set_hardware_class(base::SysInfo::HardwareModelName()); #if defined(OS_WIN) |