Implement SysInfo::HardwareModelName() on iOS.

base/sys_info_unittest.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 <stdint.h>
 
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/process/process_metrics.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/sys_info.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace base {
 
 using SysInfoTest = PlatformTest;
@@ skipping 68 matching lines @@
 TEST_F(SysInfoTest, Uptime) {
   TimeDelta up_time_1 = SysInfo::Uptime();
   // UpTime() is implemented internally using TimeTicks::Now(), which documents
   // system resolution as being 1-15ms. Sleep a little longer than that.
   PlatformThread::Sleep(TimeDelta::FromMilliseconds(20));
   TimeDelta up_time_2 = SysInfo::Uptime();
   EXPECT_GT(up_time_1.InMicroseconds(), 0);
   EXPECT_GT(up_time_2.InMicroseconds(), up_time_1.InMicroseconds());
 }
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
-TEST_F(SysInfoTest, HardwareModelName) {
+#if defined(OS_MACOSX)
+TEST_F(SysInfoTest, HardwareModelNameFormatMacAndiOS) {
   std::string hardware_model = SysInfo::HardwareModelName();
-  EXPECT_FALSE(hardware_model.empty());
+  ASSERT_FALSE(hardware_model.empty());
+  // Check that the model is of the expected format "Foo,Bar" where "Bar" is
+  // a number.
+  std::vector<StringPiece> pieces =
+      SplitStringPiece(hardware_model, ",", KEEP_WHITESPACE, SPLIT_WANT_ALL);
+  EXPECT_EQ(2u, pieces.size());

[pkl (ping after 24h if needed), 2017/05/04 21:03:51]

ASSERT_EQ?
Otherwise pieces[1] may crash if pieces.size() == 1.

[Alexei Svitkine (slow), 2017/05/04 21:06:01]

Right! Done.

+  int value;
+  EXPECT_TRUE(StringToInt(pieces[1], &value));
 }
 #endif
 
 #if defined(OS_CHROMEOS)
 
 TEST_F(SysInfoTest, GoogleChromeOSVersionNumbers) {
   int32_t os_major_version = -1;
   int32_t os_minor_version = -1;
   int32_t os_bugfix_version = -1;
   const char kLsbRelease[] =
@@ skipping 76 matching lines @@
   EXPECT_EQ("glimmer", SysInfo::GetStrippedReleaseBoard());
 
   const char* kLsbRelease2 = "CHROMEOS_RELEASE_BOARD=glimmer-signed-mp-v4keys";
   SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease2, Time());
   EXPECT_EQ("glimmer", SysInfo::GetStrippedReleaseBoard());
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace base