Revert 80819 due to failed tests

base/sys_info_mac.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 <ApplicationServices/ApplicationServices.h>
 #include <CoreServices/CoreServices.h>
 #include <mach/mach_host.h>
 #include <mach/mach_init.h>
 
 #include "base/logging.h"
 
 namespace base {
 
 // 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) {
   Gestalt(gestaltSystemVersionMajor,
       reinterpret_cast<SInt32*>(major_version));
   Gestalt(gestaltSystemVersionMinor,
       reinterpret_cast<SInt32*>(minor_version));
   Gestalt(gestaltSystemVersionBugFix,
       reinterpret_cast<SInt32*>(bugfix_version));
 }
 
 // static
 int64 SysInfo::AmountOfPhysicalMemory() {
@@ skipping 50 matching lines @@
       // The primary display in a mirrored set will be counted, but those that
       // mirror it will not be.
       ++display_count;
     }
   }
 
   return display_count;
 }
 
 }  // namespace base