platform/testing/{URL|Unit}TestHelpers improvements

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

Index: third_party/WebKit/Source/web/tests/ListenerLeakTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ListenerLeakTest.cpp b/third_party/WebKit/Source/web/tests/ListenerLeakTest.cpp
index a30220e0b71ff87db9ff118ea20497519a2ab26e..616e6913b21ec1c2d454553b850dc7c52c7d24fb 100644
--- a/third_party/WebKit/Source/web/tests/ListenerLeakTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ListenerLeakTest.cpp
@@ -29,6 +29,7 @@
  */
 
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
@@ -82,15 +83,15 @@ int GetNumObjects(const char* constructor) {
   return count;
 }
 
-class ListenerLeakTest : public testing::Test {
+class ListenerLeakTest : public ::testing::Test {
  public:
   void RunTest(const std::string& filename) {
     std::string baseURL("http://www.example.com/");
     std::string fileName(filename);
     bool executeScript = true;
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        WebString::fromUTF8(baseURL.c_str()),
-        WebString::fromUTF8(fileName.c_str()));
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(baseURL), blink::testing::webTestDataPath(),
+        WebString::fromUTF8(fileName));
     webViewHelper.initializeAndLoad(baseURL + fileName, executeScript);
   }