Reland #1: Fix the mechanism by which Blink determines OSX version number.

Source/platform/mac/ThemeMac.mm

Index: Source/platform/mac/ThemeMac.mm
diff --git a/Source/platform/mac/ThemeMac.mm b/Source/platform/mac/ThemeMac.mm
index 5218678ef87b1eac58840c2a9c3383cd368220ad..3b120064faa4037fda1765ac173b32be2f49834d 100644
--- a/Source/platform/mac/ThemeMac.mm
+++ b/Source/platform/mac/ThemeMac.mm
@@ -30,6 +30,7 @@
 #import "platform/graphics/GraphicsContextStateSaver.h"
 #import "platform/mac/BlockExceptions.h"
 #import "platform/mac/LocalCurrentGraphicsContext.h"
+#import "platform/mac/VersionUtilMac.h"
 #import "platform/mac/WebCoreNSCellExtras.h"
 #import "platform/scroll/ScrollableArea.h"
 #include "wtf/StdLibExtras.h"
@@ -696,23 +697,16 @@ void ThemeMac::paint(ControlPart part, ControlStates states, GraphicsContext* co
     }
 }
 
-#ifndef NSAppKitVersionNumber10_7
-#define NSAppKitVersionNumber10_7 1138
-#endif
-#ifndef NSAppKitVersionNumber10_9
-#define NSAppKitVersionNumber10_9 1265
-#endif
-
 bool ThemeMac::drawWithFrameDrawsFocusRing()
 {
 #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
 // If compiling against an OSX 10.8+ SDK, only 10.7 and older OSes will draw a
 // focus ring with the frame.
-    return floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_7;
+    return IsOSLionOrEarlier();
 #else
 // If compiling an OSX 10.7 or older SDK, OSes up through 10.9 will draw a focus
 // ring with the frame.
-    return floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_9;
+    return IsOSMavericksOrEarlier();
 #endif
 }