Use DiscardableMemoryManager on Android.

base/memory/discardable_memory_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/discardable_memory.h"
 
 #include <algorithm>
 
+#include "base/logging.h"

[Philippe, 2014/04/28 16:31:22]

FYI, I will remove this stale change in the next patch set.

 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_ANDROID)
 #include <limits>
 #endif
 
 namespace base {
 namespace {
 
@@ skipping 21 matching lines @@
 const size_t kSize = 1024;
 
 TEST_P(DiscardableMemoryTest, IsNamed) {
   std::string type_name(DiscardableMemory::GetTypeName(GetParam()));
   EXPECT_NE("unknown", type_name);
   EXPECT_EQ(GetParam(), DiscardableMemory::GetNamedType(type_name));
 }
 
 bool IsNativeType(DiscardableMemoryType type) {
   return
-      type == DISCARDABLE_MEMORY_TYPE_ANDROID ||
+      type == DISCARDABLE_MEMORY_TYPE_ASHMEM ||
       type == DISCARDABLE_MEMORY_TYPE_MAC;
 }
 
 TEST_P(DiscardableMemoryTest, SupportedNatively) {
   std::vector<DiscardableMemoryType> supported_types;
   DiscardableMemory::GetSupportedTypes(&supported_types);
 #if defined(DISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY)
   EXPECT_NE(0, std::count_if(supported_types.begin(),
                              supported_types.end(),
                              IsNativeType));
@@ skipping 23 matching lines @@
 
   memory->Unlock();
 }
 
 // Test delete a discardable memory while it is locked.
 TEST_P(DiscardableMemoryTest, DeleteWhileLocked) {
   const scoped_ptr<DiscardableMemory> memory(CreateLockedMemory(kSize));
   ASSERT_TRUE(memory);
 }
 
-#if !defined(OS_ANDROID)
 // Test forced purging.
 TEST_P(DiscardableMemoryTest, Purge) {
-  ASSERT_TRUE(DiscardableMemory::PurgeForTestingSupported());
-
   const scoped_ptr<DiscardableMemory> memory(CreateLockedMemory(kSize));
   ASSERT_TRUE(memory);
   memory->Unlock();
 
   DiscardableMemory::PurgeForTesting();
   EXPECT_EQ(DISCARDABLE_MEMORY_LOCK_STATUS_PURGED, memory->Lock());
 }
-#endif  // !OS_ANDROID
 
 #if !defined(NDEBUG) && !defined(OS_ANDROID)
 // Death tests are not supported with Android APKs.
 TEST_P(DiscardableMemoryTest, UnlockedMemoryAccessCrashesInDebugMode) {
   const scoped_ptr<DiscardableMemory> memory(CreateLockedMemory(kSize));
   ASSERT_TRUE(memory);
   memory->Unlock();
   ASSERT_DEATH_IF_SUPPORTED(
       { *static_cast<int*>(memory->Memory()) = 0xdeadbeef; }, ".*");
 }
 #endif
 
 std::vector<DiscardableMemoryType> GetSupportedDiscardableMemoryTypes() {
   std::vector<DiscardableMemoryType> supported_types;
   DiscardableMemory::GetSupportedTypes(&supported_types);
   return supported_types;
 }
 
 INSTANTIATE_TEST_CASE_P(
     DiscardableMemoryTests,
     DiscardableMemoryTest,
     ::testing::ValuesIn(GetSupportedDiscardableMemoryTypes()));
 
 }  // namespace
 }  // namespace base