Improve and unify Mac OS X run-time version checks

webkit/plugins/npapi/plugin_host.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 "webkit/plugins/npapi/plugin_host.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
@@ skipping 12 matching lines @@
 #include "webkit/plugins/npapi/default_plugin_shared.h"
 #include "webkit/plugins/npapi/npapi_extension_thunk.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/plugin_stream_url.h"
 #include "webkit/plugins/npapi/webplugin_delegate.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
 
 #if defined(OS_MACOSX)
-#include "base/sys_info.h"
+#include "base/mac/mac_util.h"
 #endif
 
 using WebKit::WebBindings;
 
 // Declarations for stub implementations of deprecated functions, which are no
 // longer listed in npapi.h.
 extern "C" {
 void* NPN_GetJavaEnv();
 void* NPN_GetJavaPeer(NPP);
 }
 
 namespace webkit {
 namespace npapi {
 
 // Finds a PluginInstance from an NPP.
 // The caller must take a reference if needed.
 static PluginInstance* FindInstance(NPP id) {
   if (id == NULL) {
     return NULL;
   }
   return reinterpret_cast<PluginInstance*>(id->ndata);
 }
 
 #if defined(OS_MACOSX)
 // Returns true if the OS supports shared accelerated surfaces via IOSurface.
 // This is true on Snow Leopard and higher.
 static bool SupportsSharingAcceleratedSurfaces() {
-  int32 major, minor, bugfix;
-  base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-  bool isSnowLeopardOrLater = major > 10 || (major == 10 && minor > 5);
-  if (!isSnowLeopardOrLater)
+  if (base::mac::IsOSLeopardOrEarlier())
     return false;
   // We also need to be running with desktop GL and not the software
   // OSMesa renderer in order to share accelerated surfaces between
   // processes.
   gfx::GLImplementation implementation = gfx::GetGLImplementation();
   if (implementation == gfx::kGLImplementationNone) {
     // Not initialized yet.
     if (!gfx::GLSurface::InitializeOneOff()) {
       return false;
     }
@@ skipping 789 matching lines @@
       // support it.
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
       *supports_model = false;
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsUpdatedCocoaTextInputBool: {
       // We support the clarifications to the Cocoa IME event spec, but since
       // IME currently only works on 10.6, only answer true there.
       NPBool* supports_update = reinterpret_cast<NPBool*>(value);
-      int32 major, minor, bugfix;
-      base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-      *supports_update = major > 10 || (major == 10 && minor > 5);
+      *supports_update = base::mac::IsOSSnowLeopardOrLater();
       rv = NPERR_NO_ERROR;
       break;
     }
   #endif  // OS_MACOSX
     case NPNVPepperExtensions:
       // Available for any plugin that attempts to get it.
       // If the plugin is not started in a Pepper implementation, it
       // will likely fail when it tries to use any of the functions
       // attached to the extension vector.
       rv = webkit::npapi::GetPepperExtensionsFunctions(value);
@@ skipping 276 matching lines @@
 }
 
 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) {
   scoped_refptr<PluginInstance> plugin(FindInstance(instance));
   if (plugin.get()) {
     plugin->URLRedirectResponse(!!allow, notify_data);
   }
 }
 
 }  // extern "C"