| 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 14dfe97e7df975420594e4de8ed44e358451f88d..3b11398574aa51b83ee1316705aa7fb7359767cf 100644
|
| --- a/content/child/child_discardable_shared_memory_manager.cc
|
| +++ b/content/child/child_discardable_shared_memory_manager.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/memory/discardable_memory.h"
|
| #include "base/memory/discardable_shared_memory.h"
|
| #include "base/metrics/histogram.h"
|
| +#include "base/process/memory.h"
|
| #include "base/process/process_metrics.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/trace_event/trace_event.h"
|
| @@ -264,10 +265,10 @@ ChildDiscardableSharedMemoryManager::AllocateLockedDiscardableSharedMemory(
|
| sender_->Send(
|
| new ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory(
|
| size, id, &handle));
|
| - CHECK(base::SharedMemory::IsHandleValid(handle));
|
| scoped_ptr<base::DiscardableSharedMemory> memory(
|
| new base::DiscardableSharedMemory(handle));
|
| - CHECK(memory->Map(size));
|
| + if (!memory->Map(size))
|
| + base::TerminateBecauseOutOfMemory(size);
|
| return memory.Pass();
|
| }
|
|
|
|
|