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

content/child/child_discardable_shared_memory_manager.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_CHILD_CHILD_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
 #define CONTENT_CHILD_CHILD_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
 
-#include "base/memory/discardable_memory_shmem_allocator.h"
+#include "base/memory/discardable_memory_allocator.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/content_export.h"
 #include "content/common/discardable_shared_memory_heap.h"
 
 namespace content {
 
-// Implementation of DiscardableMemoryShmemAllocator that allocates
+// Implementation of DiscardableMemoryAllocator that allocates
 // discardable memory segments through the browser process.
 class CONTENT_EXPORT ChildDiscardableSharedMemoryManager
-    : public base::DiscardableMemoryShmemAllocator {
+    : public base::DiscardableMemoryAllocator {
  public:
   explicit ChildDiscardableSharedMemoryManager(ThreadSafeSender* sender);
   ~ChildDiscardableSharedMemoryManager() override;
 
-  // Overridden from base::DiscardableMemoryShmemAllocator:
-  scoped_ptr<base::DiscardableMemoryShmemChunk> AllocateLockedDiscardableMemory(
+  // Overridden from base::DiscardableMemoryAllocator:
+  scoped_ptr<base::DiscardableMemory> AllocateLockedDiscardableMemory(
       size_t size) override;
 
   // Release memory and associated resources that have been purged.
   void ReleaseFreeMemory();
 
   bool LockSpan(DiscardableSharedMemoryHeap::Span* span);
   void UnlockSpan(DiscardableSharedMemoryHeap::Span* span);
   void ReleaseSpan(scoped_ptr<DiscardableSharedMemoryHeap::Span> span);
 
  private:
   scoped_ptr<base::DiscardableSharedMemory>
   AllocateLockedDiscardableSharedMemory(size_t size);
   void MemoryUsageChanged(size_t new_bytes_allocated,
                           size_t new_bytes_free) const;
 
   mutable base::Lock lock_;
   DiscardableSharedMemoryHeap heap_;
   scoped_refptr<ThreadSafeSender> sender_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildDiscardableSharedMemoryManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_DISCARDABLE_SHARED_MEMORY_MANAGER_H_