Improve and unify Mac OS X run-time version checks

content/renderer/webplugin_delegate_proxy.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 "content/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "content/common/child_process.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/plugin/npobject_proxy.h"
 #include "content/plugin/npobject_stub.h"
 #include "content/plugin/npobject_util.h"
 #include "content/renderer/gpu/command_buffer_proxy.h"
 #include "content/renderer/content_renderer_client.h"
@@ skipping 15 matching lines @@
 #include "ui/gfx/size.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/sad_plugin.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#endif
+
 using WebKit::WebBindings;
 using WebKit::WebCursorInfo;
 using WebKit::WebDragData;
 using WebKit::WebInputEvent;
 using WebKit::WebString;
 using WebKit::WebView;
 
 // Proxy for WebPluginResourceClient.  The object owns itself after creation,
 // deleting itself after its callback has been called.
 class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
@@ skipping 198 matching lines @@
     if (components.size() == 4 && !StartsWithASCII(components[0], "1", false))
       return true;
   } else if (LowerCaseEqualsASCII(color, "transparent")) {
     return true;
   }
   // Anything else is a named, opaque color or an RGB form with no alpha.
   return false;
 }
 
 #if defined(OS_MACOSX)
-// Returns true if the OS is 10.5 (Leopard).
-static bool OSIsLeopard() {
-  int32 major, minor, bugfix;
-  base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-  return major == 10 && minor == 5;
-}
-
 // Returns true if the given Flash version assumes QuickDraw support is present
 // instead of checking using the negotiation system.
 static bool FlashVersionAssumesQuickDrawSupport(const string16& version) {
   scoped_ptr<Version> plugin_version(
       webkit::npapi::PluginGroup::CreateVersionFromString(version));
   if (plugin_version.get() && plugin_version->components().size() >= 2) {
     uint16 major = plugin_version->components()[0];
     uint16 minor = plugin_version->components()[1];
     return major < 10 || (major == 10 && minor < 3);
   }
@@ skipping 66 matching lines @@
          SilverlightColorIsTransparent(arg_values[i]))) {
       transparent_ = true;
     }
   }
 #if defined(OS_MACOSX)
   // Older versions of Flash just assume QuickDraw support during negotiation,
   // so force everything but transparent mode to use opaque mode on 10.5
   // (where Flash doesn't use CA) to prevent QuickDraw from being used.
   // TODO(stuartmorgan): Remove this code once the two latest major Flash
   // releases negotiate correctly.
-  if (flash && !transparent_ && OSIsLeopard() &&
+  if (flash && !transparent_ && base::mac::IsOSLeopardOrEarlier() &&
       FlashVersionAssumesQuickDrawSupport(info_.version)) {
     params.arg_names.push_back("wmode");
     params.arg_values.push_back("opaque");
   }
 #endif
   params.load_manually = load_manually;
 
   plugin_ = plugin;
 
   result = false;
@@ skipping 986 matching lines @@
 }
 #endif
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }