Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/sys_info.h

 // 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.
 
 #ifndef BASE_SYS_INFO_H_
 #define BASE_SYS_INFO_H_
 
 #include <map>
 #include <string>
 
@@ skipping 34 matching lines @@
   }
 
   // Return the available disk space in bytes on the volume containing |path|,
   // or -1 on failure.
   static int64 AmountOfFreeDiskSpace(const FilePath& path);
 
   // Returns system uptime in milliseconds.
   static int64 Uptime();
 
   // Returns a descriptive string for the current machine model or an empty
-  // string if machime model is unknown or an error occured.
-  // e.g. MacPro1,1 on Mac.
-  // Only implemented on OS X, will return an empty string on other platforms.
+  // string if the machine model is unknown or an error occured.
+  // e.g. "MacPro1,1" on Mac, or "Nexus 5" on Android. Only implemented on OS X,
+  // Android, and Chrome OS. This returns an empty string on other platforms.
   static std::string HardwareModelName();
 
   // Returns the name of the host operating system.
   static std::string OperatingSystemName();
 
   // Returns the version of the host operating system.
   static std::string OperatingSystemVersion();
 
   // Retrieves detailed numeric values for the OS version.
   // TODO(port): Implement a Linux version of this method and enable the
@@ skipping 54 matching lines @@
                                             const Time& lsb_release_time);
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_ANDROID)
   // Returns the Android build's codename.
   static std::string GetAndroidBuildCodename();
 
   // Returns the Android build ID.
   static std::string GetAndroidBuildID();
 
-  // Returns the device's name.
-  static std::string GetDeviceName();
-
   static int DalvikHeapSizeMB();
   static int DalvikHeapGrowthLimitMB();
 #endif  // defined(OS_ANDROID)
 
   // Returns true if this is a low-end device.
   // Low-end device refers to devices having less than 512M memory in the
   // current implementation.
   static bool IsLowEndDevice();
 };
 
 }  // namespace base
 
 #endif  // BASE_SYS_INFO_H_