platform/testing/{URL|Unit}TestHelpers improvements

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

Index: third_party/WebKit/Source/web/tests/ViewportTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ViewportTest.cpp b/third_party/WebKit/Source/web/tests/ViewportTest.cpp
index baa02b741da749c47f90e8a8b4644779a6a5999c..d44af2028926fb457e8cd3721b0a29afeaa6e6bd 100644
--- a/third_party/WebKit/Source/web/tests/ViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ViewportTest.cpp
@@ -66,15 +66,15 @@ class ViewportTest : public ::testing::Test {
   }
 
   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));
   }
 
   void registerMockedChromeURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        WebString::fromUTF8(m_chromeURL.c_str()),
-        WebString::fromUTF8(fileName.c_str()));
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_chromeURL), testing::webTestDataPath(),
+        WebString::fromUTF8(fileName));
   }
 
   void executeScript(WebFrame* frame, const WebString& code) {