base: Rename discardable memory allocator interface and remove unnecessary class.

content/child/child_discardable_shared_memory_manager.cc

Index: content/child/child_discardable_shared_memory_manager.cc
diff --git a/content/child/child_discardable_shared_memory_manager.cc b/content/child/child_discardable_shared_memory_manager.cc
index 7f11461e5966122f97afefe7a22f189b08a453cb..6b2c63133acf272b3abd1f624f0129206088070d 100644
--- a/content/child/child_discardable_shared_memory_manager.cc
+++ b/content/child/child_discardable_shared_memory_manager.cc
@@ -5,6 +5,7 @@
 #include "content/child/child_discardable_shared_memory_manager.h"
 
 #include "base/debug/crash_logging.h"
+#include "base/memory/discardable_memory.h"
 #include "base/memory/discardable_shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/process/process_metrics.h"
@@ -23,18 +24,14 @@ const size_t kAllocationSize = 32 * 1024 * 1024;
 const size_t kAllocationSize = 4 * 1024 * 1024;
 #endif
 
-class DiscardableMemoryShmemChunkImpl
-    : public base::DiscardableMemoryShmemChunk {
+class DiscardableMemoryImpl : public base::DiscardableMemory {
  public:
-  DiscardableMemoryShmemChunkImpl(
-      ChildDiscardableSharedMemoryManager* manager,
-      scoped_ptr<DiscardableSharedMemoryHeap::Span> span)
+  DiscardableMemoryImpl(ChildDiscardableSharedMemoryManager* manager,
+                        scoped_ptr<DiscardableSharedMemoryHeap::Span> span)
       : manager_(manager), span_(span.Pass()) {}
-  ~DiscardableMemoryShmemChunkImpl() override {
-    manager_->ReleaseSpan(span_.Pass());
-  }
+  ~DiscardableMemoryImpl() override { manager_->ReleaseSpan(span_.Pass()); }
 
-  // Overridden from DiscardableMemoryShmemChunk:
+  // Overridden from base::DiscardableMemory:
   bool Lock() override { return manager_->LockSpan(span_.get()); }
   void Unlock() override { manager_->UnlockSpan(span_.get()); }
   void* Memory() const override {
@@ -42,10 +39,10 @@ class DiscardableMemoryShmemChunkImpl
   }
 
  private:
-  ChildDiscardableSharedMemoryManager* manager_;
+  ChildDiscardableSharedMemoryManager* const manager_;
   scoped_ptr<DiscardableSharedMemoryHeap::Span> span_;
 
-  DISALLOW_COPY_AND_ASSIGN(DiscardableMemoryShmemChunkImpl);
+  DISALLOW_COPY_AND_ASSIGN(DiscardableMemoryImpl);
 };
 
 }  // namespace
@@ -62,7 +59,7 @@ ChildDiscardableSharedMemoryManager::~ChildDiscardableSharedMemoryManager() {
     MemoryUsageChanged(0, 0);
 }
 
-scoped_ptr<base::DiscardableMemoryShmemChunk>
+scoped_ptr<base::DiscardableMemory>
 ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableMemory(
     size_t size) {
   base::AutoLock lock(lock_);
@@ -116,8 +113,7 @@ ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableMemory(
     // at least one span from the free lists.
     MemoryUsageChanged(heap_.GetSize(), heap_.GetSizeOfFreeLists());
 
-    return make_scoped_ptr(
-        new DiscardableMemoryShmemChunkImpl(this, free_span.Pass()));
+    return make_scoped_ptr(new DiscardableMemoryImpl(this, free_span.Pass()));
   }
 
   // Release purged memory to free up the address space before we attempt to
@@ -153,8 +149,7 @@ ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableMemory(
 
   MemoryUsageChanged(heap_.GetSize(), heap_.GetSizeOfFreeLists());
 
-  return make_scoped_ptr(
-      new DiscardableMemoryShmemChunkImpl(this, new_span.Pass()));
+  return make_scoped_ptr(new DiscardableMemoryImpl(this, new_span.Pass()));
 }
 
 void ChildDiscardableSharedMemoryManager::ReleaseFreeMemory() {