Minor sky/engine updates for Mac target

sky/engine/platform/BUILD.gn

 # Copyright 2014 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("//build/config/ui.gni")
 import("//sky/engine/build/scripts/scripts.gni")
 import("//sky/engine/config.gni")
 import("//testing/test.gni")
 
 # Most targets in this file are private actions so use that as the default.
@@ skipping 499 matching lines @@
     "weborigin/KURL.h",
     "weborigin/KURLHash.h",
     "weborigin/KnownPorts.cpp",
     "weborigin/KnownPorts.h",
     "weborigin/Referrer.h",
     "weborigin/ReferrerPolicy.h",
     "weborigin/SecurityPolicy.cpp",
     "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") +
              get_target_outputs(":color_data")
 
   configs += [
     "//sky/engine:config",
     "//sky/engine:non_test_config",
   ]
 
@@ skipping 40 matching lines @@
   if (is_android) {
     # Add in some Linux files also shared with Android.
     set_sources_assignment_filter([])
     sources += [
       "exported/linux/WebFontRenderStyle.cpp",
       "fonts/linux/FontPlatformDataLinux.cpp",
     ]
     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" ]
   }
 
   if (target_cpu == "arm") {
     deps += [ ":sky_arm_neon" ]
   }
 }
 
 test("platform_unittests") {
@@ skipping 17 matching lines @@
     "fonts/GlyphPageTreeNodeTest.cpp",
     "fonts/android/FontCacheAndroidTest.cpp",
     "geometry/FloatBoxTest.cpp",
     "geometry/FloatBoxTestHelpers.cpp",
     "geometry/FloatRoundedRectTest.cpp",
     "geometry/RegionTest.cpp",
     "geometry/RoundedRectTest.cpp",
     "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",
     "text/UnicodeUtilitiesTest.cpp",
     "transforms/TransformOperationsTest.cpp",
     "transforms/TransformationMatrixTest.cpp",
     "weborigin/KURLTest.cpp",
     "weborigin/SecurityPolicyTest.cpp",
   ]
 
@@ skipping 37 matching lines @@
     # See https://bugs.webkit.org/show_bug.cgi?id=62916.
     # TODO(GYP)
     #'cflags': ['-marm'],
     #    'conditions': [
     #      ['OS=="android"', {
     #        'cflags!': ['-mthumb'],
     #      }],
     #    ],
   }
 }