platform/testing/{URL|Unit}TestHelpers improvements

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

Index: third_party/WebKit/Source/web/tests/PrerenderingTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp b/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp
index 5ca09d256ca20d6d70f9ce79a4116625a9fa81ed..48dd4b0942bbef33453d348413534896caf0ed62 100644
--- a/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp
+++ b/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp
@@ -30,6 +30,7 @@
 
 #include "core/dom/NodeTraversal.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebPrerender.h"
 #include "public/platform/WebPrerenderingSupport.h"
@@ -156,7 +157,7 @@ class TestPrerenderingSupport : public WebPrerenderingSupport {
   Vector<WebPrerender> m_abandonedPrerenders;
 };
 
-class PrerenderingTest : public testing::Test {
+class PrerenderingTest : public ::testing::Test {
  public:
   ~PrerenderingTest() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
@@ -164,8 +165,9 @@ class PrerenderingTest : public testing::Test {
   }
 
   void initialize(const char* baseURL, const char* fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL),
-                                                 WebString::fromUTF8(fileName));
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(baseURL), blink::testing::webTestDataPath(),
+        WebString::fromUTF8(fileName));
     const bool RunJavascript = true;
     m_webViewHelper.initialize(RunJavascript);
     m_webViewHelper.webView()->setPrerendererClient(&m_prerendererClient);