Reland r267170 "Use DiscardableMemoryManager on Android."

base/memory/discardable_memory_emulated.cc

 // Copyright 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_emulated.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/discardable_memory_manager.h"
 
 namespace base {
 namespace {
 
 base::LazyInstance<internal::DiscardableMemoryManager>::Leaky g_manager =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace internal {
 
-DiscardableMemoryEmulated::DiscardableMemoryEmulated(size_t size)
-    : is_locked_(false) {
-  g_manager.Pointer()->Register(this, size);
+DiscardableMemoryEmulated::DiscardableMemoryEmulated(size_t bytes)
+    : bytes_(bytes),
+      is_locked_(false) {
+  g_manager.Pointer()->Register(this, bytes);
 }
 
 DiscardableMemoryEmulated::~DiscardableMemoryEmulated() {
   if (is_locked_)
     Unlock();
   g_manager.Pointer()->Unregister(this);
 }
 
 // static
 void DiscardableMemoryEmulated::RegisterMemoryPressureListeners() {
@@ skipping 31 matching lines @@
   g_manager.Pointer()->ReleaseLock(this);
   is_locked_ = false;
 }
 
 void* DiscardableMemoryEmulated::Memory() const {
   DCHECK(is_locked_);
   DCHECK(memory_);
   return memory_.get();
 }
 
-bool DiscardableMemoryEmulated::AllocateAndAcquireLock(size_t bytes) {
+bool DiscardableMemoryEmulated::AllocateAndAcquireLock() {
   if (memory_)
     return true;
 
-  memory_.reset(new uint8[bytes]);
+  memory_.reset(new uint8[bytes_]);
   return false;
 }
 
 void DiscardableMemoryEmulated::Purge() {
   memory_.reset();
 }
 
 }  // namespace internal
 }  // namespace base