Move Resource subclasses out of fetch/

Source/core/fetch/CachingCorrectnessTest.cpp

 /*
  * Copyright (c) 2014, 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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 "config.h"
 
 #include "core/fetch/FetchContext.h"
-#include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourcePtr.h"
 #include "platform/network/ResourceRequest.h"
 #include "public/platform/Platform.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefPtr.h"
 #include <gtest/gtest.h>
@@ skipping 21 matching lines @@
 
     ~MockFetchContext() { }
 
     bool allowImage(bool imagesEnabled, const KURL&) const override { return true; }
     bool canRequest(Resource::Type, const ResourceRequest&, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestriction) const override { return true; }
 
 private:
     MockFetchContext() { }
 };
 
+class MockImageFactory : public ResourceFactory {
+public:
+    MockImageFactory() : ResourceFactory(Resource::Image) { }
+
+    Resource* create(const ResourceRequest& request, const String&) const override
+    {
+        return new Resource(request, Resource::Image);
+    }
+};
+
 class CachingCorrectnessTest : public ::testing::Test {
 protected:
     void advanceClock(double seconds)
     {
         m_proxyPlatform.advanceClock(seconds);
     }
 
     ResourcePtr<Resource> resourceFromResourceResponse(ResourceResponse response, Resource::Type type = Resource::Raw)
     {
         if (response.url().isNull())
@@ skipping 20 matching lines @@
 
     ResourcePtr<Resource> fetch()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
         return RawResource::fetchSynchronously(fetchRequest, fetcher());
     }
 
     ResourcePtr<Resource> fetchImage()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
-        return ImageResource::fetch(fetchRequest, fetcher());
+        fetchRequest.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextInternal);
+        return fetcher()->requestResource(fetchRequest, MockImageFactory());
     }
 
     ResourceFetcher* fetcher() const { return m_fetcher.get(); }
 
 private:
     // A simple platform that mocks out the clock, for cache freshness testing.
     class ProxyPlatform : public blink::Platform {
     public:
         ProxyPlatform() : m_platform(blink::Platform::current()), m_elapsedSeconds(0.) { }
 
@@ skipping 447 matching lines @@
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     ResourcePtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 } // namespace blink