platform/testing/{URL|Unit}TestHelpers improvements

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

 /*
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 #include "core/frame/BrowserControls.h"
 
 #include "core/dom/ClientRect.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/VisualViewport.h"
 #include "core/page/Page.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"
 #include "public/web/WebElement.h"
 #include "public/web/WebSettings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 
 namespace blink {
 
 // These tests cover browser controls scrolling on main-thread.
 // The animation for completing a partial show/hide is done in compositor so
 // it is not covered here.
-class BrowserControlsTest : public testing::Test {
+class BrowserControlsTest : public ::testing::Test {
  public:
   BrowserControlsTest() : m_baseURL("http://www.test.com/") {
     registerMockedHttpURLLoad("large-div.html");
     registerMockedHttpURLLoad("overflow-scrolling.html");
     registerMockedHttpURLLoad("iframe-scrolling.html");
     registerMockedHttpURLLoad("iframe-scrolling-inner.html");
     registerMockedHttpURLLoad("percent-height.html");
     registerMockedHttpURLLoad("vh-height.html");
     registerMockedHttpURLLoad("vh-height-width-800.html");
     registerMockedHttpURLLoad("vh-height-width-800-extra-wide.html");
@@ skipping 21 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()),
-        WebString::fromUTF8(fileName.c_str()));
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL), testing::webTestDataPath(),
+        WebString::fromUTF8(fileName));
   }
 
   WebCoalescedInputEvent generateEvent(WebInputEvent::Type type,
                                        int deltaX = 0,
                                        int deltaY = 0) {
     WebGestureEvent event(type, WebInputEvent::NoModifiers,
                           WebInputEvent::TimeStampForTesting);
     event.sourceDevice = WebGestureDeviceTouchscreen;
     event.x = 100;
     event.y = 100;
@@ skipping 890 matching lines @@
     view->setScrollOffset(view->getScrollOffset(), ProgrammaticScroll);
 
     ASSERT_EQ(80.f, webView->browserControls().contentOffset());
     EXPECT_EQ(expectedRootOffset, rootViewport->getScrollOffset().height());
 
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollEnd));
   }
 }
 
 }  // namespace blink