Report Android Build.MODEL in SystemProfileProto hardware_class.

base/sys_info_android.cc

Index: base/sys_info_android.cc
diff --git a/base/sys_info_android.cc b/base/sys_info_android.cc
index 245097ffdc092626923e8bcb2f1bbf99e08e51d6..41c2e1aeabb5d2d3b7ba977344aef4196572ea80 100644
--- a/base/sys_info_android.cc
+++ b/base/sys_info_android.cc
@@ -7,6 +7,7 @@
 #include <dlfcn.h>
 #include <sys/system_properties.h>
 
+#include "base/android/build_info.h"
 #include "base/android/sys_utils.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ -177,6 +178,10 @@ std::string SysInfo::GetDeviceName() {
   return std::string(device_model_str);
 }
 
+std::string SysInfo::HardwareModelName() {
+  return base::android::BuildInfo::GetInstance()->model();

[Nico, 2015/07/10 19:52:22]

This does 14 jni calls to fill out BuildInfo and then ignores all but one of
them. I guess this will only be called very rarely so it's ok?

[jdduke (slow), 2015/07/10 20:01:14]

The JNI calls are only made when the singleton is constructed, and the singleton
itself is used all over the place (primarily for sdk_int()). I suspect it will
already have been constructed by the time we hit this getter.

That said, we should probably be consistent in this class, and it's still not
clear how this query differs from the above ro.product.model fetcher.

+}
+
 std::string SysInfo::OperatingSystemVersion() {
   int32 major, minor, bugfix;
   OperatingSystemVersionNumbers(&major, &minor, &bugfix);