Loading: split tests depend on FontResource to loader/resource/FontResourceTest

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

Index: third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
index 4e9a25a8d7b13ffbba2dac473be34ef374efa194..52ef616575ffca68b8fee03209de847d06041dea 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp
@@ -33,7 +33,6 @@
 #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/MockFetchContext.h"
@@ -45,7 +44,6 @@
 #include "platform/heap/Handle.h"
 #include "platform/heap/HeapAllocator.h"
 #include "platform/heap/Member.h"
-#include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceTimingInfo.h"
 #include "platform/scheduler/test/fake_web_task_runner.h"
@@ -261,63 +259,6 @@ TEST_F(ResourceFetcherTest, RevalidateWhileFinishingLoading) {
   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), "");
-
-  MockFetchContext* context =
-      MockFetchContext::create(MockFetchContext::kShouldLoadNewResource);
-  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(
       MockFetchContext::create(MockFetchContext::kShouldLoadNewResource));
@@ -673,60 +614,4 @@ TEST_F(ResourceFetcherTest, Revalidate304) {
   EXPECT_NE(resource, newResource);
 }
 
-TEST_F(ResourceFetcherTest, CacheAwareFontLoading) {
-  KURL url(ParsedURLString, "http://127.0.0.1:8000/font.woff");
-  ResourceResponse response;
-  response.setURL(url);
-  response.setHTTPStatusCode(200);
-  Platform::current()->getURLLoaderMockFactory()->registerURL(
-      url, WrappedResourceResponse(response), "");
-
-  ResourceFetcher* fetcher = ResourceFetcher::create(
-      MockFetchContext::create(MockFetchContext::kShouldLoadNewResource));
-
-  FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
-  fetchRequest.setCacheAwareLoadingEnabled(IsCacheAwareLoadingEnabled);
-  FontResource* resource = FontResource::fetch(fetchRequest, fetcher);
-  ASSERT_TRUE(resource);
-
-  Persistent<MockFontResourceClient> client =
-      new MockFontResourceClient(resource);
-  fetcher->startLoad(resource);
-  EXPECT_TRUE(resource->loader()->isCacheAwareLoadingActivated());
-  resource->m_loadLimitState = FontResource::UnderLimit;
-
-  // FontResource callbacks should be blocked during cache-aware loading.
-  resource->fontLoadShortLimitCallback(nullptr);
-  EXPECT_FALSE(client->fontLoadShortLimitExceededCalled());
-
-  // Fail first request as disk cache miss.
-  resource->loader()->didFail(ResourceError::cacheMissError(url));
-
-  // Once cache miss error returns, previously blocked callbacks should be
-  // called immediately.
-  EXPECT_FALSE(resource->loader()->isCacheAwareLoadingActivated());
-  EXPECT_TRUE(client->fontLoadShortLimitExceededCalled());
-  EXPECT_FALSE(client->fontLoadLongLimitExceededCalled());
-
-  // Add client now, fontLoadShortLimitExceeded() should be called.
-  Persistent<MockFontResourceClient> client2 =
-      new MockFontResourceClient(resource);
-  EXPECT_TRUE(client2->fontLoadShortLimitExceededCalled());
-  EXPECT_FALSE(client2->fontLoadLongLimitExceededCalled());
-
-  // FontResource callbacks are not blocked now.
-  resource->fontLoadLongLimitCallback(nullptr);
-  EXPECT_TRUE(client->fontLoadLongLimitExceededCalled());
-
-  // Add client now, both callbacks should be called.
-  Persistent<MockFontResourceClient> client3 =
-      new MockFontResourceClient(resource);
-  EXPECT_TRUE(client3->fontLoadShortLimitExceededCalled());
-  EXPECT_TRUE(client3->fontLoadLongLimitExceededCalled());
-
-  Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
-  Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
-  memoryCache()->remove(resource);
-}
-
 }  // namespace blink