| Index: webkit/glue/webkitclient_impl.cc
|
| diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
|
| index 12d570260a1a3ca555714e410618db58582e1e5d..42e1d1d80ede6b64f8adfd62dfe4aef95d6f3c2a 100644
|
| --- a/webkit/glue/webkitclient_impl.cc
|
| +++ b/webkit/glue/webkitclient_impl.cc
|
| @@ -61,7 +61,7 @@ namespace {
|
| class MemoryUsageCache {
|
| public:
|
| // Retrieves the Singleton.
|
| - static MemoryUsageCache* Get() {
|
| + static MemoryUsageCache* GetInstance() {
|
| return Singleton<MemoryUsageCache>::get();
|
| }
|
|
|
| @@ -499,7 +499,7 @@ static size_t memoryUsageMBGeneric() {
|
|
|
| static size_t getMemoryUsageMB(bool bypass_cache) {
|
| size_t current_mem_usage = 0;
|
| - MemoryUsageCache* mem_usage_cache_singleton = MemoryUsageCache::Get();
|
| + MemoryUsageCache* mem_usage_cache_singleton = MemoryUsageCache::GetInstance();
|
| if (!bypass_cache &&
|
| mem_usage_cache_singleton->IsCachedValueValid(¤t_mem_usage))
|
| return current_mem_usage;
|
|
|