Implement SysInfo::HardwareModelName() on iOS.

base/sys_info_ios.mm

 // 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 "base/sys_info.h"
 
 #include <mach/mach.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #import <UIKit/UIKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_mach_port.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/macros.h"
 #include "base/process/process_metrics.h"
 #include "base/strings/sys_string_conversions.h"
 
 namespace base {
 
+namespace {
+
+// Queries sysctlbyname() for the given key and returns the value from the
+// system or the empty string on failure.
+std::string GetSysctlValue(const char* key_name) {
+  char value[256];
+  size_t len = arraysize(value);
+  if (sysctlbyname(key_name, &value, &len, nullptr, 0) == 0) {
+    DCHECK_GE(len, 1u);
+    DCHECK_EQ('\0', value[len - 1]);
+    return std::string(value, len - 1);
+  }
+  return std::string();
+}
+
+}  // namespace
+
 // static
 std::string SysInfo::OperatingSystemName() {
   static dispatch_once_t get_system_name_once;
   static std::string* system_name;
   dispatch_once(&get_system_name_once, ^{
       base::mac::ScopedNSAutoreleasePool pool;
       system_name = new std::string(
           SysNSStringToUTF8([[UIDevice currentDevice] systemName]));
   });
   // Examples of returned value: 'iPhone OS' on iPad 5.1.1
@@ skipping 54 matching lines @@
   SystemMemoryInfoKB info;
   if (!GetSystemMemoryInfo(&info))
     return 0;
   // We should add inactive file-backed memory also but there is no such
   // information from iOS unfortunately.
   return static_cast<int64_t>(info.free + info.speculative) * 1024;
 }
 
 // static
 std::string SysInfo::CPUModelName() {
-  char name[256];
-  size_t len = arraysize(name);
-  if (sysctlbyname("machdep.cpu.brand_string", &name, &len, NULL, 0) == 0)
-    return name;
-  return std::string();
+  return GetSysctlValue("machdep.cpu.brand_string");
+}
+
+// static
+std::string SysInfo::HardwareModelName() {
+  return GetSysctlValue("hw.model");

[pkl (ping after 24h if needed), 2017/05/04 19:50:22]

I patched this CL and tested it on a real device (iPhone5S).
hw.model returns some strange string "N53AP". On simulator, it returns
"MacPro6,1".

Based on https://gist.github.com/Tokuriku/9708472cbe1095030c8b
I tried "hw.machine". That returns "iPhone6,2" on device and "x86_64" on
simulator.
I think "hw.machine" is the better key to use here.

Is there a unit test that we can add to run only on iOS devices to be sure that
the returned value is somewhat "sane"?

[Alexei Svitkine (slow), 2017/05/04 20:01:41]

Wow - that's pretty strange. Thanks for checking!

I can expand the test SysInfoTest.HardwareModelName - which should run on Mac
and iOS - to specifically look for the pattern "Foo,Bar". Let's see if that
works and matches the pattern. Will also use hw.machine. I'll ping the CL when
it's ready for another look.

 }
 
 }  // namespace base