platform/testing/{URL|Unit}TestHelpers improvements

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

Index: third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp b/third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp
index 569af1e36e247bef1ae03119b86881443b5730ab..e90620939e71048cb3438e54505a10374cfb7b2f 100644
--- a/third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp
@@ -18,7 +18,7 @@
 
 using blink::FrameTestHelpers::loadFrame;
 using blink::testing::runPendingTasks;
-using blink::URLTestHelpers::registerMockedURLFromBaseURL;
+using blink::URLTestHelpers::registerMockedURLLoadFromBase;
 
 namespace blink {
 
@@ -92,8 +92,9 @@ void ImeOnFocusTest::runImeOnFocusTest(std::string fileName,
                                        const AtomicString& focusElement,
                                        std::string frame) {
   ImeRequestTrackingWebViewClient client;
-  registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL),
-                               WebString::fromUTF8(fileName));
+  registerMockedURLLoadFromBase(WebString::fromUTF8(m_baseURL),
+                                testing::webTestDataPath(),
+                                WebString::fromUTF8(fileName));
   WebViewImpl* webView = m_webViewHelper.initialize(true, 0, &client);
   webView->resize(WebSize(800, 1200));
   loadFrame(webView->mainFrame(), m_baseURL + fileName);
@@ -108,8 +109,9 @@ void ImeOnFocusTest::runImeOnFocusTest(std::string fileName,
     sendGestureTap(webView, tapPoint);
 
   if (!frame.empty()) {
-    registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL),
-                                 WebString::fromUTF8(frame));
+    registerMockedURLLoadFromBase(WebString::fromUTF8(m_baseURL),
+                                  testing::webTestDataPath(),
+                                  WebString::fromUTF8(frame));
     WebFrame* childFrame = webView->mainFrame()->firstChild();
     loadFrame(childFrame, m_baseURL + frame);
   }