Revert 267170 "Use DiscardableMemoryManager on Android."

trunk/src/base/memory/discardable_memory_win.cc

Index: trunk/src/base/memory/discardable_memory_win.cc
===================================================================
--- trunk/src/base/memory/discardable_memory_win.cc	(revision 267174)
+++ trunk/src/base/memory/discardable_memory_win.cc	(working copy)
@@ -35,7 +35,7 @@
     DiscardableMemoryType type, size_t size) {
   switch (type) {
     case DISCARDABLE_MEMORY_TYPE_NONE:
-    case DISCARDABLE_MEMORY_TYPE_ASHMEM:
+    case DISCARDABLE_MEMORY_TYPE_ANDROID:
     case DISCARDABLE_MEMORY_TYPE_MAC:
       return scoped_ptr<DiscardableMemory>();
     case DISCARDABLE_MEMORY_TYPE_EMULATED: {
@@ -61,6 +61,11 @@
 }
 
 // static
+bool DiscardableMemory::PurgeForTestingSupported() {
+  return true;
+}
+
+// static
 void DiscardableMemory::PurgeForTesting() {
   internal::DiscardableMemoryEmulated::PurgeForTesting();
 }