platform/testing/{URL|Unit}TestHelpers improvements

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

 // Copyright 2015 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/frame/FrameView.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/Page.h"
 #include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/CompositorMutation.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 #include "wtf/PtrUtil.h"
 #include <gtest/gtest.h>
 #include <memory>
 
 namespace blink {
 
 typedef bool TestParamRootLayerScrolling;
 class CompositorWorkerTest
-    : public testing::WithParamInterface<TestParamRootLayerScrolling>,
+    : public ::testing::WithParamInterface<TestParamRootLayerScrolling>,
       private ScopedRootLayerScrollingForTest,
       private ScopedCompositorWorkerForTest,
-      public testing::Test {
+      public ::testing::Test {
  public:
   CompositorWorkerTest()
       : ScopedRootLayerScrollingForTest(GetParam()),
         ScopedCompositorWorkerForTest(true),
         m_baseURL("http://www.test.com/") {}
 
   void SetUp() override {
     m_helper.initialize(true, nullptr, &m_mockWebViewClient, nullptr,
                         &configureSettings);
     webViewImpl()->resize(IntSize(320, 240));
   }
 
   ~CompositorWorkerTest() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
   void navigateTo(const String& url) {
     FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url.utf8().data());
   }
 
   void forceFullCompositingUpdate() {
     webViewImpl()->updateAllLifecyclePhases();
   }
 
   void registerMockedHttpURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        m_baseURL, WebString::fromUTF8(fileName.c_str()));
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        m_baseURL, testing::webTestDataPath(),
+        WebString::fromUTF8(fileName.c_str()));

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

removing c_str

   }
 
   WebLayer* getRootScrollLayer() {
     if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
       DCHECK(frame());
       DCHECK(frame()->view());
       DCHECK(frame()->view()->layoutViewportScrollableArea());
       DCHECK(
           frame()->view()->layoutViewportScrollableArea()->layerForScrolling());
       return frame()
@@ skipping 290 matching lines @@
 
     const String& opacityValue =
         document->domWindow()
             ->getComputedStyle(proxiedElement, String())
             ->getPropertyValueInternal(CSSPropertyOpacity);
     EXPECT_EQ("0.8", opacityValue);
   }
 }
 
 }  // namespace blink