Revert 80819 due to failed tests

base/sys_info.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include "base/base_api.h"
 #include "base/basictypes.h"
@@ skipping 23 matching lines @@
 
   // 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
   // corresponding unit test.
-  static void OperatingSystemVersionNumbers(int32* major_version,
-                                            int32* minor_version,
-                                            int32* bugfix_version);
+  static void OperatingSystemVersionNumbers(int32 *major_version,
+                                            int32 *minor_version,
+                                            int32 *bugfix_version);
 
   // Returns the CPU architecture of the system. Exact return value may differ
   // across platforms.
   static std::string CPUArchitecture();
 
   // Returns the pixel dimensions of the primary display via the
   // width and height parameters.
   static void GetPrimaryDisplayDimensions(int* width, int* height);
 
   // Return the number of displays.
   static int DisplayCount();
 
   // Return the smallest amount of memory (in bytes) which the VM system will
   // allocate.
   static size_t VMAllocationGranularity();
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Returns the maximum SysV shared memory segment size.
   static size_t MaxSharedMemorySize();
 #endif
 
 #if defined(OS_CHROMEOS)
   // Returns the name of the version entry we wish to look up in the
   // Linux Standard Base release information file.
   static std::string GetLinuxStandardBaseVersionKey();
 
   // Parses /etc/lsb-release to get version information for Google Chrome OS.
   // Declared here so it can be exposed for unit testing.
   static void ParseLsbRelease(const std::string& lsb_release,
-                              int32* major_version,
-                              int32* minor_version,
-                              int32* bugfix_version);
+                              int32 *major_version,
+                              int32 *minor_version,
+                              int32 *bugfix_version);
 #endif
 };
 
 }  // namespace base
 
 #endif  // BASE_SYS_INFO_H_