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

content/common/host_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_COMMON_HOST_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
 #define CONTENT_COMMON_HOST_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
-#include "base/memory/discardable_memory_shmem_allocator.h"
+#include "base/memory/discardable_memory_allocator.h"
 #include "base/memory/discardable_shared_memory.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process_handle.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 
 namespace content {
 typedef int32_t DiscardableSharedMemoryId;
 
-// Implementation of DiscardableMemoryShmemAllocator that allocates and
-// manages discardable memory segments for the browser process and child
-// processes. This class is thread-safe and instances can safely be used
-// on any thread.
+// Implementation of DiscardableMemoryAllocator that allocates and manages
+// discardable memory segments for the browser process and child processes.
+// This class is thread-safe and instances can safely be used on any thread.
 class CONTENT_EXPORT HostDiscardableSharedMemoryManager
-    : public base::DiscardableMemoryShmemAllocator {
+    : public base::DiscardableMemoryAllocator {
  public:
   HostDiscardableSharedMemoryManager();
   ~HostDiscardableSharedMemoryManager() override;
 
   // Returns a singleton instance.
   static HostDiscardableSharedMemoryManager* current();
 
-  // Overridden from base::DiscardableMemoryShmemAllocator:
-  scoped_ptr<base::DiscardableMemoryShmemChunk> AllocateLockedDiscardableMemory(
+  // Overridden from base::DiscardableMemoryAllocator:
+  scoped_ptr<base::DiscardableMemory> AllocateLockedDiscardableMemory(
       size_t size) override;
 
   // This allocates a discardable memory segment for |process_handle|.
   // A valid shared memory handle is returned on success.
   void AllocateLockedDiscardableSharedMemoryForChild(
       base::ProcessHandle process_handle,
       size_t size,
       DiscardableSharedMemoryId id,
       base::SharedMemoryHandle* shared_memory_handle);
 
@@ skipping 72 matching lines @@
   scoped_ptr<base::MemoryPressureListener> memory_pressure_listener_;
   bool enforce_memory_policy_pending_;
   base::WeakPtrFactory<HostDiscardableSharedMemoryManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HostDiscardableSharedMemoryManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_HOST_DISCARDABLE_SHARED_MEMORY_MANAGER_H_