MemoryCache: Enable MemoryCache to have multiple isolated resource maps

Source/core/fetch/ImageResourceTest.cpp

Index: Source/core/fetch/ImageResourceTest.cpp
diff --git a/Source/core/fetch/ImageResourceTest.cpp b/Source/core/fetch/ImageResourceTest.cpp
index ee4728eb3fd64b4522f0484aeaaccd956b1487ab..9d72a976ed1710f000b5228289181644fc18e59b 100644
--- a/Source/core/fetch/ImageResourceTest.cpp
+++ b/Source/core/fetch/ImageResourceTest.cpp
@@ -129,6 +129,7 @@ TEST(ImageResourceTest, MultipartImage)
 
 TEST(ImageResourceTest, CancelOnDetach)
 {
+    const String cacheIdentifier = MemoryCache::defaultCacheIdentifier();
     KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
     URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html", "text/html");
 
@@ -150,12 +151,12 @@ TEST(ImageResourceTest, CancelOnDetach)
     // The load should still be alive, but a timer should be started to cancel the load inside removeClient().
     cachedImage->removeClient(&client);
     EXPECT_EQ(Resource::Pending, cachedImage->status());
-    EXPECT_NE(reinterpret_cast<Resource*>(0), memoryCache()->resourceForURL(testURL));
+    EXPECT_NE(reinterpret_cast<Resource*>(0), memoryCache()->resourceForURL(cacheIdentifier, testURL));
 
     // Trigger the cancel timer, ensure the load was cancelled and the resource was evicted from the cache.
     blink::testing::runPendingTasks();
     EXPECT_EQ(Resource::LoadError, cachedImage->status());
-    EXPECT_EQ(reinterpret_cast<Resource*>(0), memoryCache()->resourceForURL(testURL));
+    EXPECT_EQ(reinterpret_cast<Resource*>(0), memoryCache()->resourceForURL(cacheIdentifier, testURL));
 
     blink::Platform::current()->unitTestSupport()->unregisterMockedURL(testURL);
 }