platform/testing/{URL|Unit}TestHelpers improvements

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

 #include "core/frame/FrameView.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebInputEvent.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebHistoryItem.h"
 #include "public/web/WebScriptSource.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebView.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 
 namespace blink {
 
-class ProgrammaticScrollTest : public testing::Test {
+class ProgrammaticScrollTest : public ::testing::Test {
  public:
   ProgrammaticScrollTest() : m_baseURL("http://www.test.com/") {}
 
   void TearDown() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
  protected:
   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));
   }
 
   std::string m_baseURL;
   FrameTestHelpers::TestWebFrameClient m_mockWebFrameClient;
 };
 
 TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithScale) {
   registerMockedHttpURLLoad("long_scroll.html");
 
   FrameTestHelpers::WebViewHelper webViewHelper;
@@ skipping 45 matching lines @@
   // FrameLoader::restoreScrollPositionAndViewState flows differently if scale
   // is zero.
   loader.restoreScrollPositionAndViewState();
 
   // Expect that only the scroll position was restored.
   EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor());
   EXPECT_EQ(400, webViewImpl->mainFrameImpl()->getScrollOffset().height);
 }
 
 }  // namespace blink