| Index: base/memory/discardable_memory_allocator.h
|
| diff --git a/base/memory/discardable_memory_allocator.h b/base/memory/discardable_memory_allocator.h
|
| index ea7947e1ccfe003bdd28bb6a4bd56e82bde0e565..ad73f0890d6cbe80b01c763f02c43a305aa3c161 100644
|
| --- a/base/memory/discardable_memory_allocator.h
|
| +++ b/base/memory/discardable_memory_allocator.h
|
| @@ -7,8 +7,9 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/base_export.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace base {
|
| class DiscardableMemory;
|
| @@ -22,7 +23,7 @@ class BASE_EXPORT DiscardableMemoryAllocator {
|
| // Ownership of |instance| remains with the caller.
|
| static void SetInstance(DiscardableMemoryAllocator* allocator);
|
|
|
| - virtual scoped_ptr<DiscardableMemory> AllocateLockedDiscardableMemory(
|
| + virtual std::unique_ptr<DiscardableMemory> AllocateLockedDiscardableMemory(
|
| size_t size) = 0;
|
|
|
| protected:
|
|
|