Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(992)

Unified Diff: Source/core/fetch/CachingCorrectnessTest.cpp

Issue 1170503003: Remove resource type-specific fetching logic from ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Null-check Document::loader() before calling startPreload() Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/fetch/CSSStyleSheetResource.cpp ('k') | Source/core/fetch/DocumentResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fetch/CachingCorrectnessTest.cpp
diff --git a/Source/core/fetch/CachingCorrectnessTest.cpp b/Source/core/fetch/CachingCorrectnessTest.cpp
index e3ec937214bd7c7485b431ccfec8430a629ae2fe..c65511652f470e691d5146ac329154abfd37ea6c 100644
--- a/Source/core/fetch/CachingCorrectnessTest.cpp
+++ b/Source/core/fetch/CachingCorrectnessTest.cpp
@@ -33,6 +33,7 @@
#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"
@@ -106,13 +107,13 @@ protected:
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(); }
@@ -468,7 +469,7 @@ TEST_F(CachingCorrectnessTest, PostToSameURLTwice)
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);
« no previous file with comments | « Source/core/fetch/CSSStyleSheetResource.cpp ('k') | Source/core/fetch/DocumentResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698