Minor sky/engine updates for Mac target

sky/engine/platform/BUILD.gn

Index: sky/engine/platform/BUILD.gn
diff --git a/sky/engine/platform/BUILD.gn b/sky/engine/platform/BUILD.gn
index 8c6bef578e67c3b298e7ba83120e9580b5945abd..d8b37bc86327c0eb1a3edfe0eef3b0e41d285c0e 100644
--- a/sky/engine/platform/BUILD.gn
+++ b/sky/engine/platform/BUILD.gn
@@ -517,6 +517,10 @@ source_set("platform") {
     "weborigin/SecurityPolicy.h",
   ]
 
+  if (is_ios || is_mac) {
+    sources += [ "fonts/apple/FontPlatformDataApple.cpp" ]
+  }
+
   # Add in the generated files.
   sources += get_target_outputs(":font_family_names") +
              get_target_outputs(":runtime_enabled_features") +
@@ -577,10 +581,6 @@ source_set("platform") {
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
-  if (is_ios) {
-    sources += [ "fonts/ios/FontPlatformDataIOS.cpp" ]
-  }
-
   if (is_linux) {
     direct_dependent_configs = [ "//build/config/linux:fontconfig" ]
   }
@@ -618,7 +618,7 @@ test("platform_unittests") {
     "graphics/GraphicsContextTest.cpp",
     "graphics/ThreadSafeDataTransportTest.cpp",
     "image-decoders/ImageDecoderTest.cpp",
-    "mac/ScrollElasticityControllerTest.mm",
+    "network/HTTPParsersTest.cpp",

[abarth-chromium, 2015/07/15 20:57:40]

Bad merge?  This file should have been deleted.

[Chinmay, 2015/07/15 21:05:56]

That was a bad merge. Fixed.

     "testing/RunAllTests.cpp",
     "text/BidiResolverTest.cpp",
     "text/SegmentedStringTest.cpp",