Chromium Code Reviews| Index: content/child/child_thread_impl.cc |
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc |
| index bfb1f3a21bf3d4fe20fd40242e37debfd6673457..47e2aef437fa6521cdd38cc3423354bce6c98a28 100644 |
| --- a/content/child/child_thread_impl.cc |
| +++ b/content/child/child_thread_impl.cc |
| @@ -590,7 +590,7 @@ scoped_ptr<base::SharedMemory> ChildThreadImpl::AllocateSharedMemory( |
| shared_buf.reset(new base::SharedMemory); |
| if (!shared_buf->CreateAnonymous(buf_size)) { |
| NOTREACHED(); |
| - return NULL; |
| + return nullptr; |
| } |
| #else |
| // On POSIX, we need to ask the browser to create the shared memory for us, |
| @@ -602,11 +602,11 @@ scoped_ptr<base::SharedMemory> ChildThreadImpl::AllocateSharedMemory( |
| shared_buf.reset(new base::SharedMemory(shared_mem_handle, false)); |
| } else { |
| NOTREACHED() << "Browser failed to allocate shared memory"; |
| - return NULL; |
| + return nullptr; |
| } |
| } else { |
| - NOTREACHED() << "Browser allocation request message failed"; |
| - return NULL; |
| + // Send is allowed to fail during shutdown. Return null in this case. |
| + return nullptr; |
|
reveman
2015/09/18 14:51:35
Note: I can't have a ChildProcess::current() call
|
| } |
| #endif |
| return shared_buf; |