posix: move mac-specific code into mac-specific file

No functional change, just cleanup.

Review URL: http://codereview.chromium.org/384069

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31758 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 71 insertions, 63 deletions

diff --git a/base/sys_info_mac.cc b/base/sys_info_mac.cc
index 54b7320..79caf55 100644
--- a/base/sys_info_mac.cc
+++ b/base/sys_info_mac.cc
@@ -4,7 +4,12 @@
 
 #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 {
 
@@ -20,4 +25,65 @@ void SysInfo::OperatingSystemVersionNumbers(int32 *major_version,
       reinterpret_cast<SInt32*>(bugfix_version));
 }
 
+// static
+int64 SysInfo::AmountOfPhysicalMemory() {
+  struct host_basic_info hostinfo;
+  mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
+  int result = host_info(mach_host_self(),
+                         HOST_BASIC_INFO,
+                         reinterpret_cast<host_info_t>(&hostinfo),
+                         &count);
+  DCHECK_EQ(HOST_BASIC_INFO_COUNT, count);
+  if (result != KERN_SUCCESS) {
+    NOTREACHED();
+    return 0;
+  }
+
+  return static_cast<int64>(hostinfo.max_mem);
+}
+
+// static
+void SysInfo::GetPrimaryDisplayDimensions(int* width, int* height) {
+  CGDirectDisplayID main_display = CGMainDisplayID();
+  if (width)
+    *width = CGDisplayPixelsWide(main_display);
+  if (height)
+    *height = CGDisplayPixelsHigh(main_display);
+}
+
+// static
+int SysInfo::DisplayCount() {
+  // Don't just return the number of online displays.  It includes displays
+  // that mirror other displays, which are not desired in the count.  It's
+  // tempting to use the count returned by CGGetActiveDisplayList, but active
+  // displays exclude sleeping displays, and those are desired in the count.
+
+  // It would be ridiculous to have this many displays connected, but
+  // CGDirectDisplayID is just an integer, so supporting up to this many
+  // doesn't hurt.
+  CGDirectDisplayID online_displays[128];
+  CGDisplayCount online_display_count = 0;
+  if (CGGetOnlineDisplayList(arraysize(online_displays),
+                             online_displays,
+                             &online_display_count) != kCGErrorSuccess) {
+    // 1 is a reasonable assumption.
+    return 1;
+  }
+
+  int display_count = 0;
+  for (CGDisplayCount online_display_index = 0;
+       online_display_index < online_display_count;
+       ++online_display_index) {
+    CGDirectDisplayID online_display = online_displays[online_display_index];
+    if (CGDisplayMirrorsDisplay(online_display) == kCGNullDirectDisplay) {
+      // If this display doesn't mirror any other, include it in the count.
+      // 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
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc
index 41afff2..ffbc204b7 100644
--- a/base/sys_info_posix.cc
+++ b/base/sys_info_posix.cc
@@ -10,12 +10,6 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
-#if defined(OS_MACOSX)
-#include <ApplicationServices/ApplicationServices.h>
-#include <mach/mach_host.h>
-#include <mach/mach_init.h>
-#endif
-
 #if defined(OS_OPENBSD)
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -51,25 +45,12 @@ int SysInfo::NumberOfProcessors() {
 #endif
 }
 
+#if !defined(OS_MACOSX)
 // static
 int64 SysInfo::AmountOfPhysicalMemory() {
+#if defined(OS_FREEBSD)
   // _SC_PHYS_PAGES is not part of POSIX and not available on OS X or
   // FreeBSD
-#if defined(OS_MACOSX)
-  struct host_basic_info hostinfo;
-  mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
-  int result = host_info(mach_host_self(),
-                         HOST_BASIC_INFO,
-                         reinterpret_cast<host_info_t>(&hostinfo),
-                         &count);
-  DCHECK_EQ(HOST_BASIC_INFO_COUNT, count);
-  if (result != KERN_SUCCESS) {
-    NOTREACHED();
-    return 0;
-  }
-
-  return static_cast<int64>(hostinfo.max_mem);
-#elif defined(OS_FREEBSD)
   // TODO(benl): I have no idea how to get this
   NOTIMPLEMENTED();
   return 0;
@@ -84,6 +65,7 @@ int64 SysInfo::AmountOfPhysicalMemory() {
   return static_cast<int64>(pages) * page_size;
 #endif
 }
+#endif
 
 // static
 int64 SysInfo::AmountOfFreeDiskSpace(const FilePath& path) {
@@ -141,64 +123,24 @@ std::string SysInfo::CPUArchitecture() {
   return std::string(info.machine);
 }
 
+#if !defined(OS_MACOSX)
 // static
 void SysInfo::GetPrimaryDisplayDimensions(int* width, int* height) {
-#if defined(OS_MACOSX)
-  CGDirectDisplayID main_display = CGMainDisplayID();
-  if (width)
-    *width = CGDisplayPixelsWide(main_display);
-  if (height)
-    *height = CGDisplayPixelsHigh(main_display);
-#else
   // TODO(port): http://crbug.com/21732
   NOTIMPLEMENTED();
   if (width)
     *width = 0;
   if (height)
     *height = 0;
-#endif
 }
 
 // static
 int SysInfo::DisplayCount() {
-#if defined(OS_MACOSX)
-  // Don't just return the number of online displays.  It includes displays
-  // that mirror other displays, which are not desired in the count.  It's
-  // tempting to use the count returned by CGGetActiveDisplayList, but active
-  // displays exclude sleeping displays, and those are desired in the count.
-
-  // It would be ridiculous to have this many displays connected, but
-  // CGDirectDisplayID is just an integer, so supporting up to this many
-  // doesn't hurt.
-  CGDirectDisplayID online_displays[128];
-  CGDisplayCount online_display_count = 0;
-  if (CGGetOnlineDisplayList(arraysize(online_displays),
-                             online_displays,
-                             &online_display_count) != kCGErrorSuccess) {
-    // 1 is a reasonable assumption.
-    return 1;
-  }
-
-  int display_count = 0;
-  for (CGDisplayCount online_display_index = 0;
-       online_display_index < online_display_count;
-       ++online_display_index) {
-    CGDirectDisplayID online_display = online_displays[online_display_index];
-    if (CGDisplayMirrorsDisplay(online_display) == kCGNullDirectDisplay) {
-      // If this display doesn't mirror any other, include it in the count.
-      // The primary display in a mirrored set will be counted, but those that
-      // mirror it will not be.
-      ++display_count;
-    }
-  }
-
-  return display_count;
-#else
   // TODO(port): http://crbug.com/21732
   NOTIMPLEMENTED();
   return 1;
-#endif
 }
+#endif
 
 // static
 size_t SysInfo::VMAllocationGranularity() {