platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/web/tests/ViewportTest.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 48 matching lines @@
  protected:
   ViewportTest()
       : m_baseURL("http://www.test.com/"), m_chromeURL("chrome://") {}
 
   ~ViewportTest() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
   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) {
     frame->executeScript(WebScriptSource(code));
     runPendingTasks();
   }
 
   std::string m_baseURL;
   std::string m_chromeURL;
 };
@@ skipping 3118 matching lines @@
       m_baseURL + "viewport/viewport-warnings-7.html", true, &webFrameClient,
       nullptr, nullptr, setViewportSettings);
 
   Page* page = webViewHelper.webView()->page();
   runViewportTest(page, 320, 352);
 
   EXPECT_EQ(0U, webFrameClient.messages.size());
 }
 
 }  // namespace blink