Remove WebUnitTestSupport

third_party/WebKit/Source/web/tests/TopControlsTest.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 19 matching lines @@
 #include "core/frame/TopControls.h"
 
 #include "core/dom/ClientRect.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutView.h"
 #include "core/page/Page.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebUnitTestSupport.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 top controls scrolling on main-thread.
 // The animation for completing a partial show/hide is done in compositor so
 // it is not covered here.
 class TopControlsTest : public testing::Test {
 public:
     TopControlsTest()
         : 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");
     }
 
     ~TopControlsTest() override
     {
-        Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
+        Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
+        WebCache::clear();
     }
 
     WebViewImpl* initialize(const std::string& pageName = "large-div.html")
     {
         RuntimeEnabledFeatures::setInertTopControlsEnabled(true);
 
         // Load a page with large body and set viewport size to 400x400 to ensure
         // main frame is scrollable.
         m_helper.initializeAndLoad(m_baseURL + pageName, true, 0, 0, &configureSettings);
 
@@ skipping 644 matching lines @@
     // that's 1600px wide so the minimum scale is 0.25 to encompass that.
     ASSERT_EQ(0.25f, webView->minimumPageScaleFactor());
 
     // The viewport will match the layout width at scale=0.5 so the height used
     // for vh should be (300 / 0.5) for the layout height + (100 / 0.5) for top
     // controls = 800.
     EXPECT_EQ(800, frame()->view()->viewportSizeForViewportUnits().height());
 }
 
 } // namespace blink