platform/testing/{URL|Unit}TestHelpers improvements

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 77 matching lines @@
  private:
   int m_actionSetCount;
   WebTouchAction m_action;
 };
 
 const int kfakeTouchId = 7;
 
 class TouchActionTest : public ::testing::Test {
  public:
   TouchActionTest() : m_baseURL("http://www.test.com/") {
-    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL),
-                                                 "touch-action-tests.css");
-    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL),
-                                                 "touch-action-tests.js");
-    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL),
-                                                 "white-1x1.png");
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL), testing::webTestDataPath(),
+        "touch-action-tests.css");
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL), testing::webTestDataPath(),
+        "touch-action-tests.js");
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL), testing::webTestDataPath(),
+        "white-1x1.png");
   }
 
   void TearDown() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
  protected:
   void runTouchActionTest(std::string file);
   void runShadowDOMTest(std::string file);
@@ skipping 74 matching lines @@
     runTestOnTree(contentDoc.get(), webView, client);
   }
 
   // Explicitly reset to break dependency on locally scoped client.
   m_webViewHelper.reset();
 }
 
 WebView* TouchActionTest::setupTest(
     std::string file,
     TouchActionTrackingWebWidgetClient& client) {
-  URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL),
-                                               WebString::fromUTF8(file));
+  URLTestHelpers::registerMockedURLLoadFromBase(WebString::fromUTF8(m_baseURL),
+                                                testing::webTestDataPath(),
+                                                WebString::fromUTF8(file));
   // Note that JavaScript must be enabled for shadow DOM tests.
   WebView* webView =
       m_webViewHelper.initializeAndLoad(m_baseURL + file, true, 0, 0, &client);
 
   // Set size to enable hit testing, and avoid line wrapping for consistency
   // with browser.
   webView->resize(WebSize(800, 1200));
 
   // Scroll to verify the code properly transforms windows to client co-ords.
   const int kScrollOffset = 100;
@@ skipping 198 matching lines @@
 
 TEST_F(TouchActionTest, ShadowDOM) {
   runShadowDOMTest("touch-action-shadow-dom.html");
 }
 
 TEST_F(TouchActionTest, Pan) {
   runTouchActionTest("touch-action-pan.html");
 }
 
 }  // namespace blink