Remove resource type-specific fetching logic from ResourceFetcher

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 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 "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>
 
 namespace blink {
@@ skipping 53 matching lines @@
             new Resource(request, type);
         resource->setResponse(ResourceResponse(KURL(ParsedURLString, kResourceURL), "text/html", 0, nullAtom, String()));
         memoryCache()->add(resource.get());
 
         return resource;
     }
 
     ResourcePtr<Resource> fetch()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
-        return m_fetcher->fetchSynchronously(fetchRequest);
+        return RawResource::fetchSynchronously(fetchRequest, fetcher());
     }
 
     ResourcePtr<Resource> fetchImage()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
-        return m_fetcher->fetchImage(fetchRequest);
+        return ImageResource::fetch(fetchRequest, fetcher());
     }
 
     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 335 matching lines @@
 {
     ResourceRequest request1(KURL(ParsedURLString, kResourceURL));
     request1.setHTTPMethod("POST");
     ResourcePtr<Resource> resource1 = new Resource(ResourceRequest(request1.url()), Resource::Raw);
     resource1->setLoading(true);
     memoryCache()->add(resource1.get());
 
     ResourceRequest request2(KURL(ParsedURLString, kResourceURL));
     request2.setHTTPMethod("POST");
     FetchRequest fetch2(request2, FetchInitiatorInfo());
-    ResourcePtr<Resource> resource2 = fetcher()->fetchSynchronously(fetch2);
+    ResourcePtr<Resource> resource2 = RawResource::fetchSynchronously(fetch2, fetcher());
 
     EXPECT_EQ(resource2, memoryCache()->resourceForURL(request2.url()));
     EXPECT_NE(resource1, resource2);
 }
 
 TEST_F(CachingCorrectnessTest, 302RedirectNotImplicitlyFresh)
 {
     KURL redirectUrl(ParsedURLString, kResourceURL);
     const char redirectTargetUrlString[] = "http://redirect-target.com";
     KURL redirectTargetUrl(ParsedURLString, redirectTargetUrlString);
@@ skipping 91 matching lines @@
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     ResourcePtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 } // namespace blink