Index: base/memory/discardable_memory_win.cc |
diff --git a/base/memory/discardable_memory_win.cc b/base/memory/discardable_memory_win.cc |
index f4aade3c602f574001e0383fa75093de81262f27..81ae19d746732f908f57954526d369811ef8b1b1 100644 |
--- a/base/memory/discardable_memory_win.cc |
+++ b/base/memory/discardable_memory_win.cc |
@@ -31,19 +31,19 @@ scoped_ptr<DiscardableMemory> DiscardableMemory::CreateLockedMemoryWithType( |
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_ASHMEM: |
case DISCARDABLE_MEMORY_TYPE_MAC: |
NOTREACHED(); |
- return scoped_ptr<DiscardableMemory>(); |
+ return nullptr; |
} |
NOTREACHED(); |
- return scoped_ptr<DiscardableMemory>(); |
+ return nullptr; |
} |
// static |