1 files changed, 11 insertions, 11 deletions
diff --git a/WebKit/chromium/src/WebCache.cpp b/WebKit/chromium/src/WebCache.cpp
index c124bdf..2203498 100644
--- a/WebKit/chromium/src/WebCache.cpp
+++ b/WebKit/chromium/src/WebCache.cpp
@@ -31,20 +31,20 @@
 #include "config.h"
 #include "WebCache.h"
 
-// Instead of providing accessors, we make all members of Cache public.
-// This will make it easier to track WebCore changes to the Cache class.
-// FIXME: We should introduce public getters on the Cache class.
+// Instead of providing accessors, we make all members of MemoryCache public.
+// This will make it easier to track WebCore changes to the MemoryCache class.
+// FIXME: We should introduce public getters on the MemoryCache class.
 #define private public
-#include "Cache.h"
+#include "MemoryCache.h"
 #undef private
 
 using namespace WebCore;
 
 namespace WebKit {
 
-// A helper method for coverting a Cache::TypeStatistic to a
+// A helper method for coverting a MemoryCache::TypeStatistic to a
 // WebCache::ResourceTypeStat.
-static void ToResourceTypeStat(const Cache::TypeStatistic& from,
+static void ToResourceTypeStat(const MemoryCache::TypeStatistic& from,
                                WebCache::ResourceTypeStat& to)
 {
     to.count = static_cast<size_t>(from.count);
@@ -56,7 +56,7 @@ static void ToResourceTypeStat(const Cache::TypeStatistic& from,
 void WebCache::setCapacities(
     size_t minDeadCapacity, size_t maxDeadCapacity, size_t capacity)
 {
-    Cache* cache = WebCore::cache();
+    MemoryCache* cache = WebCore::cache();
     if (cache)
         cache->setCapacities(static_cast<unsigned int>(minDeadCapacity),
                              static_cast<unsigned int>(maxDeadCapacity),
@@ -65,7 +65,7 @@ void WebCache::setCapacities(
 
 void WebCache::clear()
 {
-    Cache* cache = WebCore::cache();
+    MemoryCache* cache = WebCore::cache();
     if (cache && !cache->disabled()) {
         cache->setDisabled(true);
         cache->setDisabled(false);
@@ -76,7 +76,7 @@ void WebCache::getUsageStats(UsageStats* result)
 {
     ASSERT(result);
 
-    Cache* cache = WebCore::cache();
+    MemoryCache* cache = WebCore::cache();
     if (cache) {
         result->minDeadCapacity = cache->m_minDeadCapacity;
         result->maxDeadCapacity = cache->m_maxDeadCapacity;
@@ -89,9 +89,9 @@ void WebCache::getUsageStats(UsageStats* result)
 
 void WebCache::getResourceTypeStats(ResourceTypeStats* result)
 {
-    Cache* cache = WebCore::cache();
+    MemoryCache* cache = WebCore::cache();
     if (cache) {
-        Cache::Statistics stats = cache->getStatistics();
+        MemoryCache::Statistics stats = cache->getStatistics();
         ToResourceTypeStat(stats.images, result->images);
         ToResourceTypeStat(stats.cssStyleSheets, result->cssStyleSheets);
         ToResourceTypeStat(stats.scripts, result->scripts);