Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / base / memory / discardable_memory_win.cc

diff --git a/src/base/memory/discardable_memory_win.cc b/src/base/memory/discardable_memory_win.cc
index e44b7c2..fbd496d 100644 (file)
--- a/src/base/memory/discardable_memory_win.cc
+++ b/src/base/memory/discardable_memory_win.cc
@@ -35,7 +35,7 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType(
     DiscardableMemoryType type, size_t size) {
   switch (type) {
     case DISCARDABLE_MEMORY_TYPE_NONE:
-    case DISCARDABLE_MEMORY_TYPE_ANDROID:
+    case DISCARDABLE_MEMORY_TYPE_ASHMEM:
     case DISCARDABLE_MEMORY_TYPE_MAC:
       return scoped_ptr<DiscardableMemory>();
     case DISCARDABLE_MEMORY_TYPE_EMULATED: {
@@ -61,11 +61,6 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType(
 }
 
 // static
-bool DiscardableMemory::PurgeForTestingSupported() {
-  return true;
-}
-
-// static
 void DiscardableMemory::PurgeForTesting() {
   internal::DiscardableMemoryEmulated::PurgeForTesting();
 }