Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/sys_info_android.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 "base/sys_info.h"
 
 #include <dlfcn.h>
 #include <sys/system_properties.h>
 
 #include "base/android/sys_utils.h"
@@ skipping 137 matching lines @@
      result = base::SysInfo::AmountOfPhysicalMemoryMB() / 6;
   }
   result = std::min<int64>(std::max<int64>(16 * MB, result), 512 * MB) / MB;
   return static_cast<int>(result);
 }
 
 }  // anonymous namespace
 
 namespace base {
 
+std::string SysInfo::HardwareModelName() {
+  char device_model_str[PROP_VALUE_MAX];
+  __system_property_get("ro.product.model", device_model_str);
+  return std::string(device_model_str);
+}
+
 std::string SysInfo::OperatingSystemName() {
   return "Android";
 }
 
-std::string SysInfo::GetAndroidBuildCodename() {
-  char os_version_codename_str[PROP_VALUE_MAX];
-  __system_property_get("ro.build.version.codename", os_version_codename_str);
-  return std::string(os_version_codename_str);
-}
-
-std::string SysInfo::GetAndroidBuildID() {
-  char os_build_id_str[PROP_VALUE_MAX];
-  __system_property_get("ro.build.id", os_build_id_str);
-  return std::string(os_build_id_str);
-}
-
-std::string SysInfo::GetDeviceName() {
-  char device_model_str[PROP_VALUE_MAX];
-  __system_property_get("ro.product.model", device_model_str);
-  return std::string(device_model_str);
-}
-
 std::string SysInfo::OperatingSystemVersion() {
   int32 major, minor, bugfix;
   OperatingSystemVersionNumbers(&major, &minor, &bugfix);
   return StringPrintf("%d.%d.%d", major, minor, bugfix);
 }
 
 void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
                                             int32* minor_version,
                                             int32* bugfix_version) {
   // Read the version number string out from the properties.
   char os_version_str[PROP_VALUE_MAX];
   __system_property_get("ro.build.version.release", os_version_str);
 
   // Parse out the numbers.
   ParseOSVersionNumbers(os_version_str, major_version, minor_version,
                         bugfix_version);
 }
 
+std::string SysInfo::GetAndroidBuildCodename() {
+  char os_version_codename_str[PROP_VALUE_MAX];
+  __system_property_get("ro.build.version.codename", os_version_codename_str);
+  return std::string(os_version_codename_str);
+}
+
+std::string SysInfo::GetAndroidBuildID() {
+  char os_build_id_str[PROP_VALUE_MAX];
+  __system_property_get("ro.build.id", os_build_id_str);
+  return std::string(os_build_id_str);
+}
+
 int SysInfo::DalvikHeapSizeMB() {
   static int heap_size = GetDalvikHeapSizeMB();
   return heap_size;
 }
 
 int SysInfo::DalvikHeapGrowthLimitMB() {
   static int heap_growth_limit = GetDalvikHeapGrowthLimitMB();
   return heap_growth_limit;
 }
 
 static base::LazyInstance<
     base::internal::LazySysInfoValue<bool,
         android::SysUtils::IsLowEndDeviceFromJni> >::Leaky
     g_lazy_low_end_device = LAZY_INSTANCE_INITIALIZER;
 
 bool SysInfo::IsLowEndDevice() {
   return g_lazy_low_end_device.Get().value();
 }
 
 
 }  // namespace base