Loading: move FontResource to core/loader/resource

third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

 /*
  * Copyright (c) 2013, 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/fetch/ResourceFetcher.h"
 
 #include "core/fetch/FetchInitiatorInfo.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/fetch/FetchRequest.h"
-#include "core/fetch/FontResource.h"
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/MockResourceClients.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/ResourceLoader.h"
 #include "platform/WebTaskRunner.h"
 #include "platform/exported/WrappedResourceResponse.h"
 #include "platform/heap/Handle.h"
 #include "platform/heap/HeapAllocator.h"
 #include "platform/heap/Member.h"
@@ skipping 251 matching lines @@
   Persistent<RequestSameResourceOnComplete> client =
       new RequestSameResourceOnComplete(resource1);
   resource1->addClient(client);
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
   EXPECT_TRUE(client->notifyFinishedCalled());
   resource1->removeClient(client);
   memoryCache()->remove(resource1);
 }
 
-TEST_F(ResourceFetcherTest, RevalidateDeferedResourceFromTwoInitiators) {
-  KURL url(ParsedURLString, "http://127.0.0.1:8000/font.woff");
-  ResourceResponse response;
-  response.setURL(url);
-  response.setHTTPStatusCode(200);
-  response.setHTTPHeaderField(HTTPNames::ETag, "1234567890");
-  Platform::current()->getURLLoaderMockFactory()->registerURL(
-      url, WrappedResourceResponse(response), "");
-
-  ResourceFetcherTestMockFetchContext* context =
-      ResourceFetcherTestMockFetchContext::create();
-  ResourceFetcher* fetcher = ResourceFetcher::create(context);
-
-  // Fetch to cache a resource.
-  ResourceRequest request1(url);
-  FetchRequest fetchRequest1 = FetchRequest(request1, FetchInitiatorInfo());
-  Resource* resource1 = FontResource::fetch(fetchRequest1, fetcher);
-  ASSERT_TRUE(resource1);
-  fetcher->startLoad(resource1);
-  Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
-  EXPECT_TRUE(resource1->isLoaded());
-  EXPECT_FALSE(resource1->errorOccurred());
-
-  // Set the context as it is on reloads.
-  context->setLoadComplete(true);
-  context->setCachePolicy(CachePolicyRevalidate);
-
-  // Revalidate the resource.
-  ResourceRequest request2(url);
-  FetchRequest fetchRequest2 = FetchRequest(request2, FetchInitiatorInfo());
-  Resource* resource2 = FontResource::fetch(fetchRequest2, fetcher);
-  ASSERT_TRUE(resource2);
-  EXPECT_EQ(resource1, resource2);
-  EXPECT_TRUE(resource2->isCacheValidator());
-  EXPECT_TRUE(resource2->stillNeedsLoad());
-
-  // Fetch the same resource again before actual load operation starts.
-  ResourceRequest request3(url);
-  FetchRequest fetchRequest3 = FetchRequest(request3, FetchInitiatorInfo());
-  Resource* resource3 = FontResource::fetch(fetchRequest3, fetcher);
-  ASSERT_TRUE(resource3);
-  EXPECT_EQ(resource2, resource3);
-  EXPECT_TRUE(resource3->isCacheValidator());
-  EXPECT_TRUE(resource3->stillNeedsLoad());
-
-  // startLoad() can be called from any initiator. Here, call it from the
-  // latter.
-  fetcher->startLoad(resource3);
-  Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
-  EXPECT_TRUE(resource3->isLoaded());
-  EXPECT_FALSE(resource3->errorOccurred());
-  EXPECT_TRUE(resource2->isLoaded());
-  EXPECT_FALSE(resource2->errorOccurred());
-
-  memoryCache()->remove(resource1);
-}
-
 TEST_F(ResourceFetcherTest, DontReuseMediaDataUrl) {
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
   ResourceRequest request(KURL(ParsedURLString, "data:text/html,foo"));
   request.setRequestContext(WebURLRequest::RequestContextVideo);
   ResourceLoaderOptions options;
   options.dataBufferingPolicy = DoNotBufferData;
   FetchRequest fetchRequest =
       FetchRequest(request, FetchInitiatorTypeNames::internal, options);
   Resource* resource1 = RawResource::fetchMedia(fetchRequest, fetcher);
@@ skipping 335 matching lines @@
   Platform::current()->getURLLoaderMockFactory()->registerURL(
       url, WebURLResponse(), "");
   Resource* newResource = RawResource::fetch(fetchRequest, fetcher);
   fetcher->stopFetching();
   Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 
   EXPECT_NE(resource, newResource);
 }
 
 }  // namespace blink