URLLoaderMockFactory: clear MemoryCache in unregisterAllURLs

third_party/WebKit/Source/web/LinkHighlightImplTest.cpp

 /*
  * Copyright (C) 2012 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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 18 matching lines @@
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Node.h"
 #include "core/frame/FrameView.h"
 #include "core/input/EventHandler.h"
 #include "core/page/Page.h"
 #include "core/page/TouchDisambiguation.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebCache.h"
 #include "public/platform/WebContentLayer.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebInputEvent.h"
 #include "public/platform/WebSize.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebViewClient.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebInputEventConversion.h"
@@ skipping 70 matching lines @@
   touchEvent.y = 220;  // An A-link with cross-hair cursor.
   webViewImpl->enableTapHighlightAtPoint(
       getTargetedEvent(webViewImpl, touchEvent));
   ASSERT_EQ(0U, webViewImpl->numLinkHighlights());
 
   touchEvent.y = 260;  // A text input box.
   webViewImpl->enableTapHighlightAtPoint(
       getTargetedEvent(webViewImpl, touchEvent));
   ASSERT_EQ(0U, webViewImpl->numLinkHighlights());
 
-  Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
-  WebCache::clear();
+  Platform::current()
+      ->getURLLoaderMockFactory()
+      ->unregisterAllURLsAndClearMemoryCache();
 }
 
 namespace {
 
 class FakeCompositingWebViewClient
     : public FrameTestHelpers::TestWebViewClient {
  public:
   FrameTestHelpers::TestWebFrameClient m_fakeWebFrameClient;
 };
 
@@ skipping 32 matching lines @@
 
   GraphicsLayer* highlightLayer =
       webViewImpl->getLinkHighlight(0)->currentGraphicsLayerForTesting();
   ASSERT_TRUE(highlightLayer);
   EXPECT_TRUE(highlightLayer->getLinkHighlight(0));
 
   touchNode->remove(IGNORE_EXCEPTION_FOR_TESTING);
   webViewImpl->updateAllLifecyclePhases();
   ASSERT_EQ(0U, highlightLayer->numLinkHighlights());
 
-  Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
-  WebCache::clear();
+  Platform::current()
+      ->getURLLoaderMockFactory()
+      ->unregisterAllURLsAndClearMemoryCache();
 }
 
 // A lifetime test: delete LayerTreeView while running LinkHighlights.
 TEST(LinkHighlightImplTest, resetLayerTreeView) {
   std::unique_ptr<FakeCompositingWebViewClient> webViewClient =
       WTF::makeUnique<FakeCompositingWebViewClient>();
 
   const std::string url = registerMockedURLLoad();
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webViewImpl =
@@ skipping 21 matching lines @@
 
   GraphicsLayer* highlightLayer =
       webViewImpl->getLinkHighlight(0)->currentGraphicsLayerForTesting();
   ASSERT_TRUE(highlightLayer);
   EXPECT_TRUE(highlightLayer->getLinkHighlight(0));
 
   // Mimic the logic from RenderWidget::Close:
   webViewImpl->willCloseLayerTreeView();
   webViewHelper.reset();
 
-  Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
-  WebCache::clear();
+  Platform::current()
+      ->getURLLoaderMockFactory()
+      ->unregisterAllURLsAndClearMemoryCache();
 }
 
 TEST(LinkHighlightImplTest, multipleHighlights) {
   const std::string url = registerMockedURLLoad();
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webViewImpl =
       webViewHelper.initializeAndLoad(url, true, 0, compositingWebViewClient());
 
   int pageWidth = 640;
   int pageHeight = 480;
@@ skipping 10 matching lines @@
   HeapVector<Member<Node>> highlightNodes;
   IntRect boundingBox(touchEvent.x - touchEvent.data.tap.width / 2,
                       touchEvent.y - touchEvent.data.tap.height / 2,
                       touchEvent.data.tap.width, touchEvent.data.tap.height);
   findGoodTouchTargets(boundingBox, webViewImpl->mainFrameImpl()->frame(),
                        goodTargets, highlightNodes);
 
   webViewImpl->enableTapHighlights(highlightNodes);
   EXPECT_EQ(2U, webViewImpl->numLinkHighlights());
 
-  Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
-  WebCache::clear();
+  Platform::current()
+      ->getURLLoaderMockFactory()
+      ->unregisterAllURLsAndClearMemoryCache();
 }
 
 }  // namespace blink