| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/test/test_discardable_memory_allocator.h" | 5 #include "base/test/test_discardable_memory_allocator.h" |
| 6 | 6 |
| 7 #include <cstdint> | 7 #include <cstdint> |
| 8 #include <cstring> | 8 #include <cstring> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/memory/discardable_memory.h" | 11 #include "base/memory/discardable_memory.h" |
| 12 #include "base/memory/ptr_util.h" |
| 12 | 13 |
| 13 namespace base { | 14 namespace base { |
| 14 namespace { | 15 namespace { |
| 15 | 16 |
| 16 class DiscardableMemoryImpl : public DiscardableMemory { | 17 class DiscardableMemoryImpl : public DiscardableMemory { |
| 17 public: | 18 public: |
| 18 explicit DiscardableMemoryImpl(size_t size) | 19 explicit DiscardableMemoryImpl(size_t size) |
| 19 : data_(new uint8_t[size]), size_(size) {} | 20 : data_(new uint8_t[size]), size_(size) {} |
| 20 | 21 |
| 21 // Overridden from DiscardableMemory: | 22 // Overridden from DiscardableMemory: |
| (...skipping 17 matching lines...) Expand all Loading... |
| 39 } | 40 } |
| 40 | 41 |
| 41 trace_event::MemoryAllocatorDump* CreateMemoryAllocatorDump( | 42 trace_event::MemoryAllocatorDump* CreateMemoryAllocatorDump( |
| 42 const char* name, | 43 const char* name, |
| 43 trace_event::ProcessMemoryDump* pmd) const override { | 44 trace_event::ProcessMemoryDump* pmd) const override { |
| 44 return nullptr; | 45 return nullptr; |
| 45 } | 46 } |
| 46 | 47 |
| 47 private: | 48 private: |
| 48 bool is_locked_ = true; | 49 bool is_locked_ = true; |
| 49 scoped_ptr<uint8_t[]> data_; | 50 std::unique_ptr<uint8_t[]> data_; |
| 50 size_t size_; | 51 size_t size_; |
| 51 }; | 52 }; |
| 52 | 53 |
| 53 } // namespace | 54 } // namespace |
| 54 | 55 |
| 55 TestDiscardableMemoryAllocator::TestDiscardableMemoryAllocator() { | 56 TestDiscardableMemoryAllocator::TestDiscardableMemoryAllocator() { |
| 56 } | 57 } |
| 57 | 58 |
| 58 TestDiscardableMemoryAllocator::~TestDiscardableMemoryAllocator() { | 59 TestDiscardableMemoryAllocator::~TestDiscardableMemoryAllocator() { |
| 59 } | 60 } |
| 60 | 61 |
| 61 scoped_ptr<DiscardableMemory> | 62 std::unique_ptr<DiscardableMemory> |
| 62 TestDiscardableMemoryAllocator::AllocateLockedDiscardableMemory(size_t size) { | 63 TestDiscardableMemoryAllocator::AllocateLockedDiscardableMemory(size_t size) { |
| 63 return make_scoped_ptr(new DiscardableMemoryImpl(size)); | 64 return base::WrapUnique(new DiscardableMemoryImpl(size)); |
| 64 } | 65 } |
| 65 | 66 |
| 66 } // namespace base | 67 } // namespace base |
| OLD | NEW |