content: Some code cleanup related to shared memory allocation.

content/child/child_thread_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/child_thread_impl.h"
 
 #include <signal.h>
 #include <string>
 #include <utility>
 
@@ skipping 703 matching lines @@
 }
 
 mojom::RouteProvider* ChildThreadImpl::GetRemoteRouteProvider() {
   if (!remote_route_provider_) {
     DCHECK(channel_);
     channel_->GetRemoteAssociatedInterface(&remote_route_provider_);
   }
   return remote_route_provider_.get();
 }
 
-std::unique_ptr<base::SharedMemory> ChildThreadImpl::AllocateSharedMemory(
-    size_t buf_size) {
-  DCHECK(message_loop_->task_runner()->BelongsToCurrentThread());
-  return AllocateSharedMemory(buf_size, this, nullptr);
-}
-
 // static
 std::unique_ptr<base::SharedMemory> ChildThreadImpl::AllocateSharedMemory(
     size_t buf_size,
-    IPC::Sender* sender,
     bool* out_of_memory) {
   mojo::ScopedSharedBufferHandle mojo_buf =
       mojo::SharedBufferHandle::Create(buf_size);
   if (!mojo_buf->is_valid()) {
     LOG(WARNING) << "Browser failed to allocate shared memory";
     if (out_of_memory)
       *out_of_memory = true;

[nasko, 2016/12/02 19:58:08]

Do we care to disambiguate an out of memory condition (this branch) vs the
failure to unwrap (the next if condition)? Seems like only consumer is
child_shared_bitmap_manager.cc.

[sadrul, 2016/12/08 03:27:52]

Looks like the original failure mode during teardown no longer applies
(https://codereview.chromium.org/2010563004 is the CL that added this).
erikchen@: can you please confirm? In which case, we wouldn't need the
|out_of_memory| param. A null return value would imply OOM.

[erikchen, 2016/12/08 03:36:02]

right. no IPC means this is no longer necessary.

     return nullptr;
   }
 
   base::SharedMemoryHandle shared_buf;
   if (mojo::UnwrapSharedMemoryHandle(std::move(mojo_buf), &shared_buf,
                                      nullptr, nullptr) != MOJO_RESULT_OK) {
     LOG(WARNING) << "Browser failed to allocate shared memory";
     return nullptr;
   }
 
@@ skipping 165 matching lines @@
   connected_to_browser_ = true;
   child_info_ = local_info;
   browser_info_ = remote_info;
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return static_cast<bool>(browser_process_io_runner_);
 }
 
 }  // namespace content