Improve and unify Mac OS X run-time version checks

webkit/plugins/npapi/webplugin_delegate_impl_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/QuartzCore.h>
 
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #include <string>
 #include <unistd.h>
 #include <set>
 
 #include "base/file_util.h"
+#include "base/mac/mac_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/sys_info.h"
 #include "base/sys_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "webkit/glue/webkit_glue.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/plugin_web_event_converter_mac.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
@@ skipping 969 matching lines @@
       redraw_timer_->Start(
           base::TimeDelta::FromMilliseconds(kCoreAnimationRedrawPeriodMs),
           this, &WebPluginDelegateImpl::DrawLayerInSurface);
     } else if (!plugin_visible) {
       redraw_timer_->Stop();
     }
   }
 }
 
 void WebPluginDelegateImpl::StartIme() {
+  // Currently the plugin IME implementation only works on 10.6.
   if (instance()->event_model() != NPEventModelCocoa ||
-      !IsImeSupported()) {
+      base::mac::IsOSLeopardOrEarlier()) {
     return;
   }
   if (ime_enabled_)
     return;
   ime_enabled_ = true;
   plugin_->StartIme();
 }
 
-bool WebPluginDelegateImpl::IsImeSupported() {
-  // Currently the plugin IME implementation only works on 10.6.
-  static BOOL sImeSupported = NO;
-  static BOOL sHaveCheckedSupport = NO;
-  if (!sHaveCheckedSupport) {
-    int32 major, minor, bugfix;
-    base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-    sImeSupported = major > 10 || (major == 10 && minor > 5);
-    sHaveCheckedSupport = YES;
-  }
-  return sImeSupported;
-}
-
 #pragma mark -
 #pragma mark Core Animation Support
 
 void WebPluginDelegateImpl::DrawLayerInSurface() {
   // If we haven't plumbed up the surface yet, don't try to draw.
   if (!windowed_handle() || !renderer_)
     return;
 
   [renderer_ beginFrameAtTime:CACurrentMediaTime() timeStamp:NULL];
   if (CGRectIsEmpty([renderer_ updateBounds])) {
@@ skipping 147 matching lines @@
   qd_manager_->SetFastPathEnabled(enabled);
   qd_port_.port = qd_manager_->port();
   WindowlessSetWindow();
   // Send a paint event so that the new buffer gets updated immediately.
   WindowlessPaint(buffer_context_, clip_rect_);
 }
 #endif  // !NP_NO_QUICKDRAW
 
 }  // namespace npapi
 }  // namespace webkit