Index: content/child/child_discardable_shared_memory_manager.cc |
diff --git a/content/child/child_discardable_shared_memory_manager.cc b/content/child/child_discardable_shared_memory_manager.cc |
index 04db84f993415987af36930fd8892ca1b962e2e4..7bb268cc39fb95af36f7e05161d6c70844a079fd 100644 |
--- a/content/child/child_discardable_shared_memory_manager.cc |
+++ b/content/child/child_discardable_shared_memory_manager.cc |
@@ -4,6 +4,8 @@ |
#include "content/child/child_discardable_shared_memory_manager.h" |
+#include <utility> |
+ |
#include "base/atomic_sequence_num.h" |
#include "base/bind.h" |
#include "base/debug/crash_logging.h" |
@@ -32,13 +34,13 @@ class DiscardableMemoryImpl : public base::DiscardableMemory { |
public: |
DiscardableMemoryImpl(ChildDiscardableSharedMemoryManager* manager, |
scoped_ptr<DiscardableSharedMemoryHeap::Span> span) |
- : manager_(manager), span_(span.Pass()), is_locked_(true) {} |
+ : manager_(manager), span_(std::move(span)), is_locked_(true) {} |
~DiscardableMemoryImpl() override { |
if (is_locked_) |
manager_->UnlockSpan(span_.get()); |
- manager_->ReleaseSpan(span_.Pass()); |
+ manager_->ReleaseSpan(std::move(span_)); |
} |
// Overridden from base::DiscardableMemory: |
@@ -157,7 +159,8 @@ ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableMemory( |
// at least one span from the free lists. |
MemoryUsageChanged(heap_.GetSize(), heap_.GetSizeOfFreeLists()); |
- return make_scoped_ptr(new DiscardableMemoryImpl(this, free_span.Pass())); |
+ return make_scoped_ptr( |
+ new DiscardableMemoryImpl(this, std::move(free_span))); |
} |
// Release purged memory to free up the address space before we attempt to |
@@ -181,7 +184,7 @@ ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableMemory( |
// Create span for allocated memory. |
scoped_ptr<DiscardableSharedMemoryHeap::Span> new_span(heap_.Grow( |
- shared_memory.Pass(), allocation_size_in_bytes, new_id, |
+ std::move(shared_memory), allocation_size_in_bytes, new_id, |
base::Bind(&SendDeletedDiscardableSharedMemoryMessage, sender_, new_id))); |
new_span->set_is_locked(true); |
@@ -194,12 +197,12 @@ ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableMemory( |
reinterpret_cast<size_t>(leftover->shared_memory()->memory()), |
leftover->length() * base::GetPageSize()); |
leftover->set_is_locked(false); |
- heap_.MergeIntoFreeLists(leftover.Pass()); |
+ heap_.MergeIntoFreeLists(std::move(leftover)); |
} |
MemoryUsageChanged(heap_.GetSize(), heap_.GetSizeOfFreeLists()); |
- return make_scoped_ptr(new DiscardableMemoryImpl(this, new_span.Pass())); |
+ return make_scoped_ptr(new DiscardableMemoryImpl(this, std::move(new_span))); |
} |
bool ChildDiscardableSharedMemoryManager::OnMemoryDump( |
@@ -270,7 +273,7 @@ void ChildDiscardableSharedMemoryManager::ReleaseSpan( |
if (!span->shared_memory()) |
return; |
- heap_.MergeIntoFreeLists(span.Pass()); |
+ heap_.MergeIntoFreeLists(std::move(span)); |
// Bytes of free memory changed. |
MemoryUsageChanged(heap_.GetSize(), heap_.GetSizeOfFreeLists()); |
@@ -302,7 +305,7 @@ ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( |
new base::DiscardableSharedMemory(handle)); |
if (!memory->Map(size)) |
base::TerminateBecauseOutOfMemory(size); |
- return memory.Pass(); |
+ return memory; |
} |
void ChildDiscardableSharedMemoryManager::MemoryUsageChanged( |