platform/testing/{URL|Unit}TestHelpers improvements

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

Index: third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp b/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
index 9d6bfa838adc6fa0c13b15775ad49f2fdefa62ca..0ff3851293b21bff958dcc6784f1d6787d5fe93d 100644
--- a/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
+++ b/third_party/WebKit/Source/web/tests/LayoutGeometryMapTest.cpp
@@ -36,6 +36,7 @@
 #include "core/paint/PaintLayer.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.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"
@@ -48,8 +49,8 @@ namespace blink {
 
 typedef bool TestParamRootLayerScrolling;
 class LayoutGeometryMapTest
-    : public testing::Test,
-      public testing::WithParamInterface<TestParamRootLayerScrolling>,
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<TestParamRootLayerScrolling>,
       private ScopedRootLayerScrollingForTest {
  public:
   LayoutGeometryMapTest()
@@ -158,8 +159,8 @@ class LayoutGeometryMapTest
   }
 
   void registerMockedHttpURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        WebString::fromUTF8(m_baseURL.c_str()),
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL.c_str()), testing::webTestDataPath(),
         WebString::fromUTF8(fileName.c_str()));

[kinuko, 2017/01/26 09:32:41]

Not from your change, but no need of .c_str() (and we can save strlen() cost)

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

Done.

   }