Index: base/memory/discardable_memory_android.cc |
diff --git a/base/memory/discardable_memory_android.cc b/base/memory/discardable_memory_android.cc |
index 7dd8df71dc736d9e5dd5f3d5f9732d34b6020fea..b1258c2e7554f5885684fb17ba3d4f0166a089a2 100644 |
--- a/base/memory/discardable_memory_android.cc |
+++ b/base/memory/discardable_memory_android.cc |
@@ -67,26 +67,26 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType( |
new internal::DiscardableMemoryAshmem( |
size, &shared_state->allocator, &shared_state->manager)); |
if (!memory->Initialize()) |
- return scoped_ptr<DiscardableMemory>(); |
+ return nullptr; |
- return memory.PassAs<DiscardableMemory>(); |
+ return memory.Pass(); |
} |
case DISCARDABLE_MEMORY_TYPE_EMULATED: { |
scoped_ptr<internal::DiscardableMemoryEmulated> memory( |
new internal::DiscardableMemoryEmulated(size)); |
if (!memory->Initialize()) |
- return scoped_ptr<DiscardableMemory>(); |
+ return nullptr; |
- return memory.PassAs<DiscardableMemory>(); |
+ return memory.Pass(); |
} |
case DISCARDABLE_MEMORY_TYPE_NONE: |
case DISCARDABLE_MEMORY_TYPE_MAC: |
NOTREACHED(); |
- return scoped_ptr<DiscardableMemory>(); |
+ return nullptr; |
} |
NOTREACHED(); |
- return scoped_ptr<DiscardableMemory>(); |
+ return nullptr; |
} |
// static |