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

Unified Diff: Source/core/fetch/ResourceFetcherTest.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/ResourceFetcher.cpp ('k') | Source/core/fetch/ScriptResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fetch/ResourceFetcherTest.cpp
diff --git a/Source/core/fetch/ResourceFetcherTest.cpp b/Source/core/fetch/ResourceFetcherTest.cpp
index 4185c356a4836aa9bfd2614fdb4a81e3f39278b9..53e753edfe906a36c7e16523e2cd54c674380820 100644
--- a/Source/core/fetch/ResourceFetcherTest.cpp
+++ b/Source/core/fetch/ResourceFetcherTest.cpp
@@ -46,6 +46,17 @@ namespace blink {
class ResourceFetcherTest : public ::testing::Test {
};
+class TestResourceFactory : public ResourceFactory {
+public:
+ TestResourceFactory()
+ : ResourceFactory(Resource::Image) { }
+
+ Resource* create(const ResourceRequest& request, const String& charset) const override
+ {
+ return new Resource(request, Resource::Image);
+ }
+};
+
TEST_F(ResourceFetcherTest, StartLoadAfterFrameDetach)
{
KURL secureURL(ParsedURLString, "https://secureorigin.test/image.png");
@@ -53,9 +64,9 @@ TEST_F(ResourceFetcherTest, StartLoadAfterFrameDetach)
// and no resource should be present in the cache.
RefPtrWillBeRawPtr<ResourceFetcher> fetcher = ResourceFetcher::create(nullptr);
FetchRequest fetchRequest = FetchRequest(ResourceRequest(secureURL), FetchInitiatorInfo());
- ResourcePtr<ImageResource> image = fetcher->fetchImage(fetchRequest);
- EXPECT_EQ(image.get(), static_cast<ImageResource*>(0));
- EXPECT_EQ(memoryCache()->resourceForURL(secureURL), static_cast<Resource*>(0));
+ ResourcePtr<Resource> resource = fetcher->requestResource(fetchRequest, TestResourceFactory());
+ EXPECT_EQ(resource.get(), static_cast<Resource*>(nullptr));
+ EXPECT_EQ(memoryCache()->resourceForURL(secureURL), static_cast<Resource*>(nullptr));
}
} // namespace blink
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/fetch/ScriptResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698