Revert "Merge FontPlatformDataHarfBuzz into FontPlatformData"

Source/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("//third_party/WebKit/Source/build/scripts/scripts.gni")
 import("//third_party/WebKit/Source/config.gni")
 import("//third_party/WebKit/Source/platform/platform.gni")
 import("//third_party/WebKit/Source/platform/platform_generated.gni")
 
@@ skipping 207 matching lines @@
     "//third_party/libwebp",
     "//third_party/ots",
     "//third_party/qcms",
     "//url",
     "//v8",
   ]
 
   if (is_mac) {
     sources -= [
       "fonts/harfbuzz/FontHarfBuzz.cpp",
+      "fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp",
       "fonts/harfbuzz/HarfBuzzFaceSkia.cpp",
       "fonts/opentype/OpenTypeTypes.h",
       "fonts/opentype/OpenTypeVerticalData.cpp",
       "fonts/opentype/OpenTypeVerticalData.h",
       # The Mac currently uses FontCustomPlatformDataMac.cpp instead.
       "fonts/skia/FontCustomPlatformDataSkia.cpp",
       "fonts/skia/FontCacheSkia.cpp",
       "fonts/skia/SimpleFontDataSkia.cpp",
       # Uses LocaleMac instead.
       "text/LocaleICU.cpp",
@@ skipping 16 matching lines @@
 
     defines += [ "WebFontCache=ChromiumWebCoreObjCWebFontCache" ]
     configs += [ ":mac_objc_renaming" ]
     libs = [
       "Accelerate.framework",
       "Carbon.framework",
       "Foundation.framework",
     ]
   } else {
     sources -= [
+      # FIXME: We will eventually compile this too, but for now it's
+      # only used on mac.
+      "fonts/FontPlatformData.cpp",
       "fonts/harfbuzz/HarfBuzzFaceCoreText.cpp",
       "geometry/cg/FloatPointCG.cpp",
       "geometry/cg/FloatRectCG.cpp",
       "geometry/cg/FloatSizeCG.cpp",
       "geometry/cg/IntPointCG.cpp",
       "geometry/cg/IntRectCG.cpp",
       "geometry/cg/IntSizeCG.cpp",
     ]
   }
 
@@ skipping 131 matching lines @@
     #'cflags': ['-marm'],
     #    'conditions': [
     #      ['OS=="android"', {
     #        'cflags!': ['-mthumb'],
     #      }],
     #    ],
 
     deps = [ ":blink_common" ]
   }
 }