Remove deprecated shmem alloc from RenderThread and ChildThreadImpl

This CL removes deprecated RenderThread::HostAllocateSharedMemoryBuffer
since it's no longer used.

Bug: 795291
Change-Id: Ia0d4e3824d48a83ed2295351e62e4d518eb085af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1916873Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715656}

content/child/child_thread_impl.cc

@@ -825,26 +825,6 @@ mojom::RouteProvider* ChildThreadImpl::GetRemoteRouteProvider() {
   return remote_route_provider_.get();
 }
 
-// static
-std::unique_ptr<base::SharedMemory> ChildThreadImpl::AllocateSharedMemory(
-    size_t buf_size) {
-  mojo::ScopedSharedBufferHandle mojo_buf =
-      mojo::SharedBufferHandle::Create(buf_size);
-  if (!mojo_buf->is_valid()) {
-    LOG(WARNING) << "Browser failed to allocate shared memory";
-    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;
-  }
-
-  return std::make_unique<base::SharedMemory>(shared_buf, false);
-}
-
 bool ChildThreadImpl::OnMessageReceived(const IPC::Message& msg) {
   if (msg.routing_id() == MSG_ROUTING_CONTROL)
     return OnControlMessageReceived(msg);

content/child/child_thread_impl.h

@@ -13,7 +13,6 @@
 
 #include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
-#include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/single_thread_task_runner.h"
@@ -115,11 +114,6 @@ class CONTENT_EXPORT ChildThreadImpl
 
   mojom::RouteProvider* GetRemoteRouteProvider();
 
-  // Allocates a block of shared memory of the given size. Returns nullptr on
-  // failure.
-  static std::unique_ptr<base::SharedMemory> AllocateSharedMemory(
-      size_t buf_size);
-
   IPC::SyncMessageFilter* sync_message_filter() const {
     return sync_message_filter_.get();
   }

content/public/renderer/render_thread.h

@@ -10,7 +10,6 @@
 #include <memory>
 
 #include "base/callback.h"
-#include "base/memory/shared_memory.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/single_thread_task_runner.h"
 #include "content/common/content_export.h"
@@ -81,14 +80,6 @@ class CONTENT_EXPORT RenderThread : virtual public ChildThread {
   virtual void SetResourceDispatcherDelegate(
       ResourceDispatcherDelegate* delegate) = 0;
 
-  // DEPRECATED: Use mojo::Create*SharedMemoryRegion (see
-  // mojo/public/cpp/base/shared_memory_utils.h) instead.
-  //
-  // Asks the host to create a block of shared memory for the renderer.
-  // The shared memory allocated by the host is returned back.
-  virtual std::unique_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer(
-      size_t buffer_size) = 0;
-
   // Registers the given V8 extension with WebKit.
   virtual void RegisterExtension(std::unique_ptr<v8::Extension> extension) = 0;
 

content/public/test/mock_render_thread.cc

@@ -193,17 +193,6 @@ void MockRenderThread::RecordAction(const base::UserMetricsAction& action) {
 void MockRenderThread::RecordComputedAction(const std::string& action) {
 }
 
-std::unique_ptr<base::SharedMemory>
-MockRenderThread::HostAllocateSharedMemoryBuffer(size_t buffer_size) {
-  std::unique_ptr<base::SharedMemory> shared_buf(new base::SharedMemory);
-  if (!shared_buf->CreateAnonymous(buffer_size)) {
-    NOTREACHED() << "Cannot map shared memory buffer";
-    return std::unique_ptr<base::SharedMemory>();
-  }
-
-  return std::unique_ptr<base::SharedMemory>(shared_buf.release());
-}
-
 void MockRenderThread::RegisterExtension(
     std::unique_ptr<v8::Extension> extension) {
   blink::WebScriptController::RegisterExtension(std::move(extension));
@@ -342,16 +331,6 @@ bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) {
   return handled;
 }
 
-#if defined(OS_WIN)
-void MockRenderThread::OnDuplicateSection(
-    base::SharedMemoryHandle renderer_handle,
-    base::SharedMemoryHandle* browser_handle) {
-  // We don't have to duplicate the input handles since RenderViewTest does not
-  // separate a browser process from a renderer process.
-  *browser_handle = renderer_handle;
-}
-#endif  // defined(OS_WIN)
-
 // The View expects to be returned a valid route_id different from its own.
 void MockRenderThread::OnCreateWindow(
     const mojom::CreateNewWindowParams& params,

content/public/test/mock_render_thread.h

@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base/memory/shared_memory.h"
 #include "base/observer_list.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
@@ -72,8 +71,6 @@ class MockRenderThread : public RenderThread {
       ResourceDispatcherDelegate* delegate) override;
   void RecordAction(const base::UserMetricsAction& action) override;
   void RecordComputedAction(const std::string& action) override;
-  std::unique_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer(
-      size_t buffer_size) override;
   void RegisterExtension(std::unique_ptr<v8::Extension> extension) override;
   int PostTaskToAllWebWorkers(const base::Closure& closure) override;
   bool ResolveProxy(const GURL& url, std::string* proxy_list) override;
@@ -144,11 +141,6 @@ class MockRenderThread : public RenderThread {
       const FrameHostMsg_CreateChildFrame_Params& params,
       FrameHostMsg_CreateChildFrame_Params_Reply* params_reply);
 
-#if defined(OS_WIN)
-  void OnDuplicateSection(base::SharedMemoryHandle renderer_handle,
-                          base::SharedMemoryHandle* browser_handle);
-#endif
-
   IPC::TestSink sink_;
 
   // Routing ID what will be assigned to the next view, widget, or frame.

content/renderer/render_thread_impl.cc

@@ -20,7 +20,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/discardable_memory_allocator.h"
-#include "base/memory/shared_memory.h"
 #include "base/message_loop/message_pump_type.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_functions.h"
@@ -1066,11 +1065,6 @@ void RenderThreadImpl::RecordComputedAction(const std::string& action) {
   Send(new ViewHostMsg_UserMetricsRecordAction(action));
 }
 
-std::unique_ptr<base::SharedMemory>
-RenderThreadImpl::HostAllocateSharedMemoryBuffer(size_t size) {
-  return ChildThreadImpl::AllocateSharedMemory(size);
-}
-
 void RenderThreadImpl::RegisterExtension(
     std::unique_ptr<v8::Extension> extension) {
   WebScriptController::RegisterExtension(std::move(extension));

content/renderer/render_thread_impl.h

@@ -175,8 +175,6 @@ class CONTENT_EXPORT RenderThreadImpl
   void RemoveObserver(RenderThreadObserver* observer) override;
   void SetResourceDispatcherDelegate(
       ResourceDispatcherDelegate* delegate) override;
-  std::unique_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer(
-      size_t buffer_size) override;
   void RegisterExtension(std::unique_ptr<v8::Extension> extension) override;
   int PostTaskToAllWebWorkers(const base::RepeatingClosure& closure) override;
   bool ResolveProxy(const GURL& url, std::string* proxy_list) override;