Remove various Heap* types.

sky/engine/core/fetch/MemoryCache.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 38 matching lines @@
 MemoryCache* memoryCache()
 {
     ASSERT(WTF::isMainThread());
     if (!gMemoryCache)
         gMemoryCache = new OwnPtr<MemoryCache>(MemoryCache::create());
     return gMemoryCache->get();
 }
 
 PassOwnPtr<MemoryCache> replaceMemoryCacheForTesting(PassOwnPtr<MemoryCache> cache)
 {
-#if ENABLE(OILPAN)
-    // Move m_liveResources content to keep Resource objects alive.
-    for (HeapHashSet<Member<Resource> >::iterator i = memoryCache()->m_liveResources.begin();
-        i != memoryCache()->m_liveResources.end();
-        ++i) {
-        cache->m_liveResources.add(*i);
-    }
-    memoryCache()->m_liveResources.clear();
-#else
     // Make sure we have non-empty gMemoryCache.
     memoryCache();
-#endif
     OwnPtr<MemoryCache> oldCache = gMemoryCache->release();
     *gMemoryCache = cache;
     return oldCache.release();
 }
 
 void MemoryCacheEntry::trace(Visitor* visitor)
 {
     visitor->trace(m_previousInLiveResourcesList);
     visitor->trace(m_nextInLiveResourcesList);
     visitor->trace(m_previousInAllResourcesList);
@@ skipping 675 matching lines @@
                 printf("(%.1fK, %.1fK, %uA, %dR, %d, %d); ", current->decodedSize() / 1024.0f, (current->encodedSize() + current->overheadSize()) / 1024.0f, current->accessCount(), current->hasClients(), current->isPurgeable(), current->wasPurged());
 
             current = prev;
         }
     }
 }
 
 #endif // MEMORY_CACHE_STATS
 
 } // namespace blink