platform/testing/{URL|Unit}TestHelpers improvements

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Node.h"
 #include "core/html/HTMLElement.h"
 #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"
 #include "public/web/WebDocument.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 
 using blink::FrameTestHelpers::loadFrame;
 using blink::testing::runPendingTasks;
-using blink::URLTestHelpers::registerMockedURLFromBaseURL;
+using blink::URLTestHelpers::registerMockedURLLoadFromBase;
 
 namespace blink {
 
 class ImeRequestTrackingWebViewClient
     : public FrameTestHelpers::TestWebViewClient {
  public:
   ImeRequestTrackingWebViewClient() : m_virtualKeyboardRequestCount(0) {}
 
   // WebWidgetClient methods
   void showVirtualKeyboardOnElementFocus() override {
@@ skipping 53 matching lines @@
 void ImeOnFocusTest::focus(const AtomicString& element) {
   m_document->body()->getElementById(element)->focus();
 }
 
 void ImeOnFocusTest::runImeOnFocusTest(std::string fileName,
                                        int expectedVirtualKeyboardRequestCount,
                                        IntPoint tapPoint,
                                        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);
   m_document =
       m_webViewHelper.webView()->mainFrameImpl()->document().unwrap<Document>();
 
   if (!focusElement.isNull())
     focus(focusElement);
   EXPECT_EQ(0, client.virtualKeyboardRequestCount());
 
   if (tapPoint.x() >= 0 && tapPoint.y() >= 0)
     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);
   }
 
   if (!focusElement.isNull())
     focus(focusElement);
   EXPECT_EQ(expectedVirtualKeyboardRequestCount,
             client.virtualKeyboardRequestCount());
 
   m_webViewHelper.reset();
@@ skipping 20 matching lines @@
   runImeOnFocusTest("ime-on-focus-after-navigation-within-page.html", 1,
                     IntPoint(50, 50), "input");
 }
 
 TEST_F(ImeOnFocusTest, AfterFrameLoadOnGesture) {
   runImeOnFocusTest("ime-on-focus-after-frame-load-on-gesture.html", 1,
                     IntPoint(50, 50), "input", "frame.html");
 }
 
 }  // namespace blink