Index: content/common/host_discardable_shared_memory_manager.cc |
diff --git a/content/common/host_discardable_shared_memory_manager.cc b/content/common/host_discardable_shared_memory_manager.cc |
index c2e927537a091cce1f61a85ed07d693566d762ea..bd7095a9a448af4c47a8c4bb2086dbbfa87abc07 100644 |
--- a/content/common/host_discardable_shared_memory_manager.cc |
+++ b/content/common/host_discardable_shared_memory_manager.cc |
@@ -52,13 +52,13 @@ HostDiscardableSharedMemoryManager::current() { |
return g_discardable_shared_memory_manager.Pointer(); |
} |
-scoped_ptr<base::DiscardableSharedMemory> |
-HostDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory( |
+scoped_ptr<base::DiscardableMemoryShmemChunk> |
+HostDiscardableSharedMemoryManager::AllocateLockedDiscardableMemory( |
size_t size) { |
// TODO(reveman): Need to implement this for discardable memory support in |
// the browser process. |
NOTIMPLEMENTED(); |
- return scoped_ptr<base::DiscardableSharedMemory>(); |
+ return nullptr; |
} |
void HostDiscardableSharedMemoryManager:: |