platform/testing/{URL|Unit}TestHelpers improvements

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

 // Copyright 2014 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/VisualViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/BrowserControls.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLBodyElement.h"
 #include "core/html/HTMLElement.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/Page.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/geometry/DoublePoint.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/graphics/CompositorElementId.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebInputEvent.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebContextMenuData.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebScriptSource.h"
@@ skipping 67 matching lines @@
 ::std::ostream& operator<<(::std::ostream& os, const WebContextMenuData& data) {
   return os << "Context menu location: [" << data.mousePosition.x << ", "
             << data.mousePosition.y << "]";
 }
 }
 
 namespace {
 
 typedef bool TestParamRootLayerScrolling;
 class VisualViewportTest
-    : public testing::Test,
-      public testing::WithParamInterface<TestParamRootLayerScrolling>,
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<TestParamRootLayerScrolling>,
       private ScopedRootLayerScrollingForTest {
  public:
   VisualViewportTest()
       : ScopedRootLayerScrollingForTest(GetParam()),
         m_baseURL("http://www.test.com/") {}
 
   void initializeWithDesktopSettings(
       void (*overrideSettingsFunc)(WebSettings*) = 0) {
     if (!overrideSettingsFunc)
       overrideSettingsFunc = &configureSettings;
@@ skipping 18 matching lines @@
 
   void navigateTo(const std::string& url) {
     FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url);
   }
 
   void forceFullCompositingUpdate() {
     webViewImpl()->updateAllLifecyclePhases();
   }
 
   void registerMockedHttpURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
+    URLTestHelpers::registerMockedURLLoadFromBase(
         WebString::fromUTF8(m_baseURL.c_str()),

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

removing c_str

+        blink::testing::webTestDataPath(),
         WebString::fromUTF8(fileName.c_str()));
   }
 
+  void registerMockedHttpURLLoad(const std::string& url,
+                                 const std::string& fileName) {
+    URLTestHelpers::registerMockedURLLoad(
+        toKURL(url), blink::testing::webTestDataPath(fileName));
+  }
+
   WebLayer* getRootScrollLayer() {
     PaintLayerCompositor* compositor =
         frame()->contentLayoutItem().compositor();
     DCHECK(compositor);
     DCHECK(compositor->scrollLayer());
 
     WebLayer* webScrollLayer = compositor->scrollLayer()->platformLayer();
     return webScrollLayer;
   }
 
@@ skipping 1973 matching lines @@
       &configureAndroidCompositing);
 
   int pageWidth = 640;
   int pageHeight = 480;
   float browserControlsHeight = 50.0f;
   int smallestHeight = pageHeight - browserControlsHeight;
 
   webViewImpl->resizeWithBrowserControls(WebSize(pageWidth, pageHeight),
                                          browserControlsHeight, false);
 
-  URLTestHelpers::registerMockedURLLoad(toKURL("http://example.com/foo.png"),
-                                        "white-1x1.png");
+  registerMockedHttpURLLoad("http://example.com/foo.png", "white-1x1.png");
   WebURL baseURL = URLTestHelpers::toKURL("http://example.com/");
   FrameTestHelpers::loadHTMLString(webViewImpl->mainFrame(),
                                    "<!DOCTYPE html>"
                                    "<style>"
                                    "  body {"
                                    "    background: url('foo.png');"
                                    "    background-attachment: fixed;"
                                    "    background-size: cover;"
                                    "    background-repeat: no-repeat;"
                                    "  }"
@@ skipping 61 matching lines @@
       true, nullptr, nullptr, nullptr, &configureAndroidNonCompositing);
 
   int pageWidth = 640;
   int pageHeight = 480;
   float browserControlsHeight = 50.0f;
   int smallestHeight = pageHeight - browserControlsHeight;
 
   webViewImpl->resizeWithBrowserControls(WebSize(pageWidth, pageHeight),
                                          browserControlsHeight, false);
 
-  URLTestHelpers::registerMockedURLLoad(toKURL("http://example.com/foo.png"),
-                                        "white-1x1.png");
+  registerMockedHttpURLLoad("http://example.com/foo.png", "white-1x1.png");
   WebURL baseURL = URLTestHelpers::toKURL("http://example.com/");
   FrameTestHelpers::loadHTMLString(webViewImpl->mainFrame(),
                                    "<!DOCTYPE html>"
                                    "<style>"
                                    "  body {"
                                    "    margin: 0px;"
                                    "    background: url('foo.png');"
                                    "    background-attachment: fixed;"
                                    "    background-size: cover;"
                                    "    background-repeat: no-repeat;"
@@ skipping 86 matching lines @@
       &configureAndroidCompositing);
 
   int pageWidth = 640;
   int pageHeight = 480;
   float browserControlsHeight = 50.0f;
   int smallestHeight = pageHeight - browserControlsHeight;
 
   webViewImpl->resizeWithBrowserControls(WebSize(pageWidth, pageHeight),
                                          browserControlsHeight, false);
 
-  URLTestHelpers::registerMockedURLLoad(toKURL("http://example.com/foo.png"),
-                                        "white-1x1.png");
+  registerMockedHttpURLLoad("http://example.com/foo.png", "white-1x1.png");
   WebURL baseURL = URLTestHelpers::toKURL("http://example.com/");
   // This time the background is the default attachment.
   FrameTestHelpers::loadHTMLString(webViewImpl->mainFrame(),
                                    "<!DOCTYPE html>"
                                    "<style>"
                                    "  body {"
                                    "    margin: 0px;"
                                    "    background: url('foo.png');"
                                    "    background-size: cover;"
                                    "    background-repeat: no-repeat;"
@@ skipping 118 matching lines @@
                                    "  body {"
                                    "    margin: 0px;"
                                    "  }"
                                    "  div { height:110vh; width: 110vw; }"
                                    "</style>"
                                    "<div></div>",
                                    baseURL);
 }
 
 }  // namespace