MemoryCache: Enable MemoryCache to have multiple isolated resource maps

Source/core/fetch/ImageResourceTest.cpp

 /*
  * Copyright (c) 2013, 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 111 matching lines @@
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->image()->isNull());
     ASSERT_EQ(cachedImage->image()->width(), 1);
     ASSERT_EQ(cachedImage->image()->height(), 1);
     ASSERT_EQ(client.imageChangedCount(), 2);
     ASSERT_TRUE(client.notifyFinishedCalled());
 }
 
 TEST(ImageResourceTest, CancelOnDetach)
 {
+    const String cacheIdentifier = MemoryCache::defaultCacheIdentifier();
     KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
     URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html", "text/html");
 
     // Create enough of a mocked world to get a functioning ResourceLoader.
     OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create();
     RefPtr<DocumentLoader> documentLoader = DocumentLoader::create(&dummyPageHolder->frame(), ResourceRequest(testURL), SubstituteData());
 
     // Emulate starting a real load.
     ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(testURL));
     cachedImage->setIdentifier(createUniqueIdentifier());
 
     cachedImage->load(documentLoader->fetcher(), ResourceLoaderOptions());
     memoryCache()->add(cachedImage.get());
 
     MockImageResourceClient client;
     cachedImage->addClient(&client);
     EXPECT_EQ(Resource::Pending, cachedImage->status());
 
     // 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);
 }
 
 TEST(ImageResourceTest, DecodedDataRemainsWhileHasClients)
 {
     ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest());
     cachedImage->setLoading(true);
 
     MockImageResourceClient client;
@@ skipping 51 matching lines @@
     bitmapImages.add(cachedImage.get());
 
     // Updating bitmap resources produces image changed callbacks on their clients.
     ImageResource::updateBitmapImages(bitmapImages);
     ASSERT_EQ(client.imageChangedCount(), 2);
     ImageResource::updateBitmapImages(bitmapImages, true);
     ASSERT_EQ(client.imageChangedCount(), 3);
 }
 
 } // namespace