platform/testing/{URL|Unit}TestHelpers improvements

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

 // Copyright 2016 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/ClientRect.h"
 #include "core/frame/BrowserControls.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/RootFrameViewport.h"
 #include "core/frame/VisualViewport.h"
@@ skipping 63 matching lines @@
     settings->setAcceleratedCompositingEnabled(true);
     settings->setPreferCompositingToLCDTextEnabled(true);
     // Android settings.
     settings->setViewportEnabled(true);
     settings->setViewportMetaEnabled(true);
     settings->setShrinksViewportContentToFit(true);
     settings->setMainFrameResizesAreOrientationChanges(true);
   }
 
   void registerMockedHttpURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        WebString::fromUTF8(m_baseURL.c_str()),
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL.c_str()), testing::webTestDataPath(),

[Takashi Toyoshima, 2017/01/26 10:57:58]

removing c_str

         WebString::fromUTF8(fileName.c_str()));
   }
 
   void executeScript(const WebString& code) {
     executeScript(code, *mainWebFrame());
   }
 
   void executeScript(const WebString& code, WebLocalFrame& frame) {
     frame.executeScript(WebScriptSource(code));
     frame.view()->updateAllLifecyclePhases();
@@ skipping 1216 matching lines @@
   // FrameView without a layout.
   iframe->remove();
 
   EXPECT_EQ(mainFrameView()->layoutViewportScrollableArea(),
             &mainFrameView()->getRootFrameViewport()->layoutViewport());
 }
 
 }  // namespace
 
 }  // namespace blink