Report Android Build.MODEL in SystemProfileProto hardware_class.

content/common/user_agent.cc

 // Copyright 2014 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 "content/public/common/user_agent.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "build/build_config.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/utsname.h>
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 // Generated
 #include "webkit_version.h"  // NOLINT
 
 namespace content {
 
-namespace {
-
-#if defined(OS_ANDROID)
-std::string GetAndroidDeviceName() {
-  return base::SysInfo::GetDeviceName();
-}
-#endif
-
-}  // namespace
-
 std::string GetWebKitVersion() {
   return base::StringPrintf("%d.%d (%s)",
                             WEBKIT_VERSION_MAJOR,
                             WEBKIT_VERSION_MINOR,
                             WEBKIT_SVN_REVISION);
 }
 
 int GetWebKitMajorVersion() {
   return WEBKIT_VERSION_MAJOR;
 }
@@ skipping 54 matching lines @@
   base::StringAppendF(
       &android_version_str, "%d.%d", os_major_version, os_minor_version);
   if (os_bugfix_version != 0)
     base::StringAppendF(&android_version_str, ".%d", os_bugfix_version);
 
   std::string android_info_str;
 
   // Send information about the device.
   bool semicolon_inserted = false;
   std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
-  std::string android_device_name = GetAndroidDeviceName();
+  std::string android_device_name = base::SysInfo::HardwareModelName();
   if ("REL" == android_build_codename && android_device_name.size() > 0) {
     android_info_str += "; " + android_device_name;
     semicolon_inserted = true;
   }
 
   // Append the build ID.
   std::string android_build_id = base::SysInfo::GetAndroidBuildID();
   if (android_build_id.size() > 0) {
     if (!semicolon_inserted) {
       android_info_str += ";";
@@ skipping 85 matching lines @@
       os_info.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR,
       product.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR);
   return user_agent;
 }
 
 }  // namespace content