| Index: base/allocator/allocator_shim_unittest.cc
|
| diff --git a/base/allocator/allocator_shim_unittest.cc b/base/allocator/allocator_shim_unittest.cc
|
| index 4e987b6b347809705b0f821cd23139132dfea98c..e526bb88e7ec5f31c24cf180aaa68fa0a83c2294 100644
|
| --- a/base/allocator/allocator_shim_unittest.cc
|
| +++ b/base/allocator/allocator_shim_unittest.cc
|
| @@ -9,11 +9,11 @@
|
| #include <string.h>
|
| #include <unistd.h>
|
|
|
| +#include <memory>
|
| #include <new>
|
| #include <vector>
|
|
|
| #include "base/atomicops.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/threading/platform_thread.h"
|
| #include "base/threading/thread_local.h"
|
| @@ -126,7 +126,7 @@ class AllocatorShimTest : public testing::Test {
|
| size_t reallocs_intercepted_by_size[kMaxSizeTracked];
|
| size_t reallocs_intercepted_by_addr[kMaxSizeTracked];
|
| size_t frees_intercepted_by_addr[kMaxSizeTracked];
|
| - scoped_ptr<ThreadLocalBoolean> did_fail_realloc_0x42_once;
|
| + std::unique_ptr<ThreadLocalBoolean> did_fail_realloc_0x42_once;
|
| subtle::Atomic32 num_new_handler_calls;
|
|
|
| private:
|
|
|