platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp

Index: third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
index 276b3bce06467e27985b88803db4b89c949a6b24..28b717b42abba17a3d6bc1ea62a7c2039d052e61 100644
--- a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
@@ -208,7 +208,8 @@ class ScopedRegisteredURL {
                       const String& fileName = "cancelTest.html",
                       const String& mimeType = "text/html")
       : m_url(url) {
-    URLTestHelpers::registerMockedURLLoad(m_url, fileName, mimeType);
+    URLTestHelpers::registerMockedURLLoad(
+        m_url, testing::webTestDataPath(fileName.utf8().data()), mimeType);
   }
 
   ~ScopedRegisteredURL() {
@@ -1191,8 +1192,7 @@ TEST(ImageResourceTest, PeriodicFlushTest) {
   ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
       platform;
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html",
-                                        "text/html");
+  ScopedRegisteredURL scopedRegisteredURL(testURL);
   ResourceRequest request = ResourceRequest(testURL);
   ImageResource* imageResource = ImageResource::create(request);
   imageResource->setStatus(ResourceStatus::Pending);