platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp

Index: third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp b/third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp
index 298a38d844d0d38d9f81906a9378159125547008..6e9939494b854b5c42c3838ff467416d38abc11e 100644
--- a/third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontPlatformDataTest.cpp
@@ -39,13 +39,9 @@ using blink::testing::createTestFont;
 
 namespace blink {
 
-static inline String fontPath(String relativePath) {
-  return testing::blinkRootDir() + "/Source/platform/testing/data/" +
-         relativePath;
-}
-
 TEST(FontPlatformDataTest, AhemHasNoSpaceInLigaturesOrKerning) {
-  Font font = createTestFont("Ahem", fontPath("Ahem.woff"), 16);
+  Font font =
+      createTestFont("Ahem", testing::platformTestDataPath("Ahem.woff"), 16);
   const FontPlatformData& platformData = font.primaryFont()->platformData();
   TypesettingFeatures features = Kerning | Ligatures;
 
@@ -53,8 +49,9 @@ TEST(FontPlatformDataTest, AhemHasNoSpaceInLigaturesOrKerning) {
 }
 
 TEST(FontPlatformDataTest, AhemSpaceLigatureHasSpaceInLigaturesOrKerning) {
-  Font font = createTestFont("AhemSpaceLigature",
-                             fontPath("AhemSpaceLigature.woff"), 16);
+  Font font = createTestFont(
+      "AhemSpaceLigature",
+      testing::platformTestDataPath("AhemSpaceLigature.woff"), 16);
   const FontPlatformData& platformData = font.primaryFont()->platformData();
   TypesettingFeatures features = Kerning | Ligatures;
 
@@ -62,8 +59,9 @@ TEST(FontPlatformDataTest, AhemSpaceLigatureHasSpaceInLigaturesOrKerning) {
 }
 
 TEST(FontPlatformDataTest, AhemSpaceLigatureHasNoSpaceWithoutFontFeatures) {
-  Font font = createTestFont("AhemSpaceLigature",
-                             fontPath("AhemSpaceLigature.woff"), 16);
+  Font font = createTestFont(
+      "AhemSpaceLigature",
+      testing::platformTestDataPath("AhemSpaceLigature.woff"), 16);
   const FontPlatformData& platformData = font.primaryFont()->platformData();
   TypesettingFeatures features = 0;