Chromium Code Reviews| Index: base/memory/discardable_memory.cc |
| diff --git a/base/memory/discardable_memory.cc b/base/memory/discardable_memory.cc |
| index 0e3b58a356390ba604aea22d3f692701eba09fff..a99c6f8de4be11166c862546e261fec63dd18bbe 100644 |
| --- a/base/memory/discardable_memory.cc |
| +++ b/base/memory/discardable_memory.cc |
| @@ -4,14 +4,15 @@ |
| #include "base/memory/discardable_memory.h" |
| -#include "base/memory/discardable_memory_shmem.h" |
| +#include "base/memory/discardable_memory_allocator.h" |
| namespace base { |
| // static |
| scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemory( |
|
Nico
2015/03/16 21:55:30
should this go too?
reveman
2015/03/16 22:37:26
Yes, I considered that but decided to leave for a
|
| size_t size) { |
| - return make_scoped_ptr(new internal::DiscardableMemoryShmem(size)); |
| + return DiscardableMemoryAllocator::GetInstance() |
| + ->AllocateLockedDiscardableMemory(size); |
| } |
| } // namespace base |