URLLoaderMockFactory: clear MemoryCache in unregisterAllURLs

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

 /*
  * Copyright (c) 2013, Opera Software ASA. 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
@@ skipping 19 matching lines @@
 
 #include "core/frame/FrameSerializer.h"
 
 #include <string>
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "platform/SerializedResource.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebCache.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/web/WebSettings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
@@ skipping 14 matching lines @@
       : m_folder("frameserializer/"),
         m_baseUrl(toKURL("http://www.test.com")) {}
 
  protected:
   void SetUp() override {
     // We want the images to load and JavaScript to be on.
     m_helper.initialize(true, nullptr, nullptr, nullptr, &configureSettings);
   }
 
   void TearDown() override {
-    Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
-    WebCache::clear();
+    Platform::current()
+        ->getURLLoaderMockFactory()
+        ->unregisterAllURLsAndClearMemoryCache();
   }
 
   void setBaseFolder(const char* folder) { m_folder = folder; }
 
   void setRewriteURLFolder(const char* folder) { m_rewriteFolder = folder; }
 
   void registerURL(const KURL& url, const char* file, const char* mimeType) {
     registerMockedURLLoad(
         url, testing::webTestDataPath(WebString::fromUTF8(m_folder + file)),
         WebString::fromUTF8(mimeType));
@@ skipping 467 matching lines @@
                 KURL(ParsedURLString, "http://foo.com?--")));
   EXPECT_EQ("saved from url=(0020)http://foo.com/#-%2D",
             FrameSerializer::markOfTheWebDeclaration(
                 KURL(ParsedURLString, "http://foo.com#--")));
   EXPECT_EQ("saved from url=(0026)http://foo.com/#bar-%2Dbaz",
             FrameSerializer::markOfTheWebDeclaration(
                 KURL(ParsedURLString, "http://foo.com#bar--baz")));
 }
 
 }  // namespace blink