platform/testing/{URL|Unit}TestHelpers improvements

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

Index: third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp b/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
index e15730c253a0549e7dcd333083fad1a7c5bfddd5..e226f8aa2fd14911d5ebaeddf489daf40122b7f3 100644
--- a/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
@@ -2,6 +2,7 @@
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebInputEvent.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
@@ -19,7 +20,7 @@
 
 namespace blink {
 
-class ProgrammaticScrollTest : public testing::Test {
+class ProgrammaticScrollTest : public ::testing::Test {
  public:
   ProgrammaticScrollTest() : m_baseURL("http://www.test.com/") {}
 
@@ -30,9 +31,9 @@ class ProgrammaticScrollTest : public testing::Test {
 
  protected:
   void registerMockedHttpURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        WebString::fromUTF8(m_baseURL.c_str()),
-        WebString::fromUTF8(fileName.c_str()));
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL), testing::webTestDataPath(),
+        WebString::fromUTF8(fileName));
   }
 
   std::string m_baseURL;