platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp

Index: third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp
index 6b586cfee7b83e01aeb25cc0596a5796cff7f6be..5d4233ee6fcb6d271688c5a750028f0f11fac186 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp
@@ -31,6 +31,7 @@
 #include "public/web/WebFrameSerializer.h"
 
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCString.h"
@@ -101,7 +102,7 @@ int matchSubstring(const String& str, const char* pattern, size_t size) {
 
 }  // namespace
 
-class WebFrameSerializerTest : public testing::Test {
+class WebFrameSerializerTest : public ::testing::Test {
  protected:
   WebFrameSerializerTest() { m_helper.initialize(); }
 
@@ -110,11 +111,17 @@ class WebFrameSerializerTest : public testing::Test {
     WebCache::clear();
   }
 
-  void registerMockedImageURL(const String& url) {
+  void registerMockedImageURLLoad(const String& url) {
     // Image resources need to be mocked, but irrelevant here what image they
     // map to.
-    URLTestHelpers::registerMockedURLLoad(KURL(ParsedURLString, url),
-                                          "frameserialization/awesome.png");
+    registerMockedFileURLLoad(URLTestHelpers::toKURL(url.utf8().data()),
+                              "frameserialization/awesome.png");
+  }
+  void registerMockedFileURLLoad(const KURL& url,
+                                 const String& filePath,
+                                 const String& mimeType = "image/png") {
+    URLTestHelpers::registerMockedURLLoad(
+        url, testing::webTestDataPath(filePath.utf8().data()), mimeType);
   }
 
   class SingleLinkRewritingDelegate
@@ -143,8 +150,8 @@ class WebFrameSerializerTest : public testing::Test {
 
   String serializeFile(const String& url, const String& fileName) {
     KURL parsedURL(ParsedURLString, url);
-    URLTestHelpers::registerMockedURLLoad(parsedURL, fileName,
-                                          "frameserialization/", "text/html");
+    String filePath("frameserialization/" + fileName);
+    registerMockedFileURLLoad(parsedURL, filePath, "text/html");
     FrameTestHelpers::loadFrame(mainFrameImpl(), url.utf8().data());
     SingleLinkRewritingDelegate delegate(parsedURL, WebString("local"));
     SimpleWebFrameSerializerClient serializerClient;
@@ -164,7 +171,7 @@ class WebFrameSerializerTest : public testing::Test {
 };
 
 TEST_F(WebFrameSerializerTest, URLAttributeValues) {
-  registerMockedImageURL("javascript:\"");
+  registerMockedImageURLLoad("javascript:\"");
 
   const char* expectedHTML =
       "\n<!-- saved from url=(0020)http://www.test.com/ -->\n"
@@ -214,8 +221,8 @@ class WebFrameSerializerSanitizationTest : public WebFrameSerializerTest {
                             const String& fileName,
                             const String& mimeType = "text/html") {
     KURL parsedURL(ParsedURLString, url);
-    URLTestHelpers::registerMockedURLLoad(parsedURL, fileName,
-                                          "frameserialization/", mimeType);
+    String filePath("frameserialization/" + fileName);
+    registerMockedFileURLLoad(parsedURL, filePath, mimeType);
     FrameTestHelpers::loadFrame(mainFrameImpl(), url.utf8().data());
     WebThreadSafeData result = WebFrameSerializer::generateMHTMLParts(
         WebString("boundary"), mainFrameImpl(), &m_mhtmlDelegate);
@@ -303,12 +310,10 @@ TEST_F(WebFrameSerializerSanitizationTest, FromBrokenImageDocument) {
 }
 
 TEST_F(WebFrameSerializerSanitizationTest, ImageLoadedFromSrcsetForHiDPI) {
-  URLTestHelpers::registerMockedURLLoad(
-      KURL(ParsedURLString, "http://www.test.com/1x.png"),
-      "frameserialization/1x.png");
-  URLTestHelpers::registerMockedURLLoad(
-      KURL(ParsedURLString, "http://www.test.com/2x.png"),
-      "frameserialization/2x.png");
+  registerMockedFileURLLoad(KURL(ParsedURLString, "http://www.test.com/1x.png"),
+                            "frameserialization/1x.png");
+  registerMockedFileURLLoad(KURL(ParsedURLString, "http://www.test.com/2x.png"),
+                            "frameserialization/2x.png");
 
   // Set high DPR in order to load image from srcset, instead of src.
   webView()->setDeviceScaleFactor(2.0f);
@@ -328,12 +333,10 @@ TEST_F(WebFrameSerializerSanitizationTest, ImageLoadedFromSrcsetForHiDPI) {
 }
 
 TEST_F(WebFrameSerializerSanitizationTest, ImageLoadedFromSrcForNormalDPI) {
-  URLTestHelpers::registerMockedURLLoad(
-      KURL(ParsedURLString, "http://www.test.com/1x.png"),
-      "frameserialization/1x.png");
-  URLTestHelpers::registerMockedURLLoad(
-      KURL(ParsedURLString, "http://www.test.com/2x.png"),
-      "frameserialization/2x.png");
+  registerMockedFileURLLoad(KURL(ParsedURLString, "http://www.test.com/1x.png"),
+                            "frameserialization/1x.png");
+  registerMockedFileURLLoad(KURL(ParsedURLString, "http://www.test.com/2x.png"),
+                            "frameserialization/2x.png");
 
   String mhtml = generateMHTMLParts("http://www.test.com", "img_srcset.html");