Revert 80819 due to failed tests

base/sys_info_chromeos.cc

 // 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.
 
 #include "base/sys_info.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 25 matching lines @@
   int32 major_version;
   int32 minor_version;
   int32 bugfix_version;
   bool parsed;
 };
 
 static base::LazyInstance<ChromeOSVersionNumbers>
     g_chrome_os_version_numbers(base::LINKER_INITIALIZED);
 
 // static
-void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
-                                            int32* minor_version,
-                                            int32* bugfix_version) {
+void SysInfo::OperatingSystemVersionNumbers(int32 *major_version,
+                                            int32 *minor_version,
+                                            int32 *bugfix_version) {
   if (!g_chrome_os_version_numbers.Get().parsed) {
     // The other implementations of SysInfo don't block on the disk.
     // See http://code.google.com/p/chromium/issues/detail?id=60394
     // Perhaps the caller ought to cache this?
     // Temporary allowing while we work the bug out.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
 
     FilePath path(kLinuxStandardBaseReleaseFile);
     std::string contents;
     if (file_util::ReadFileToString(path, &contents)) {
       g_chrome_os_version_numbers.Get().parsed = true;
       ParseLsbRelease(contents,
           &(g_chrome_os_version_numbers.Get().major_version),
           &(g_chrome_os_version_numbers.Get().minor_version),
           &(g_chrome_os_version_numbers.Get().bugfix_version));
     }
   }
   *major_version = g_chrome_os_version_numbers.Get().major_version;
   *minor_version = g_chrome_os_version_numbers.Get().minor_version;
   *bugfix_version = g_chrome_os_version_numbers.Get().bugfix_version;
 }
 
 // static
 std::string SysInfo::GetLinuxStandardBaseVersionKey() {
   return std::string(kLinuxStandardBaseVersionKeys[0]);
 }
 
 // static
 void SysInfo::ParseLsbRelease(const std::string& lsb_release,
-                              int32* major_version,
-                              int32* minor_version,
-                              int32* bugfix_version) {
+                              int32 *major_version,
+                              int32 *minor_version,
+                              int32 *bugfix_version) {
   size_t version_key_index = std::string::npos;
   for (int i = 0; kLinuxStandardBaseVersionKeys[i] != NULL; ++i) {
     version_key_index = lsb_release.find(kLinuxStandardBaseVersionKeys[i]);
     if (std::string::npos != version_key_index) {
       break;
     }
   }
   if (std::string::npos == version_key_index) {
     return;
   }
@@ skipping 15 matching lines @@
                   minor_version);
     } else {  // 2 == i
       StringToInt(tokenizer.token_begin(),
                   tokenizer.token_end(),
                   bugfix_version);
     }
   }
 }
 
 }  // namespace base