discardable_memory: Using mojo IPC to replace Chrome IPC

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 274 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ChannelBootstrapFilter);
 };
 
 }  // namespace
 
 ChildThread* ChildThread::Get() {
   return ChildThreadImpl::current();
 }
 
 ChildThreadImpl::Options::Options()
-    : auto_start_service_manager_connection(true), connect_to_browser(false) {}
+    : auto_start_service_manager_connection(true),
+      connect_to_browser(false),
+      init_discardable_memory(false) {}
 
 ChildThreadImpl::Options::Options(const Options& other) = default;
 
 ChildThreadImpl::Options::~Options() {
 }
 
 ChildThreadImpl::Options::Builder::Builder() {
 }
 
 ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::InBrowserProcess(
     const InProcessChildThreadParams& params) {
   options_.browser_process_io_runner = params.io_runner();
   options_.in_process_service_request_token = params.service_request_token();
   return *this;
 }
 
 ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::AutoStartServiceManagerConnection(
     bool auto_start) {
   options_.auto_start_service_manager_connection = auto_start;
   return *this;
 }
 
 ChildThreadImpl::Options::Builder&
-ChildThreadImpl::Options::Builder::ConnectToBrowser(
-  bool connect_to_browser) {
+ChildThreadImpl::Options::Builder::InitDiscardableMemory(
+    bool discardable_memory) {
+  options_.init_discardable_memory = discardable_memory;
+  return *this;
+}
+
+ChildThreadImpl::Options::Builder&
+ChildThreadImpl::Options::Builder::ConnectToBrowser(bool connect_to_browser) {
   options_.connect_to_browser = connect_to_browser;
   return *this;
 }
 
 ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::AddStartupFilter(
     IPC::MessageFilter* filter) {
   options_.startup_filters.push_back(filter);
   return *this;
 }
@@ skipping 16 matching lines @@
 #if defined(OS_ANDROID)
   if (!handled && msg.is_sync()) {
     IPC::Message* reply = IPC::SyncMessage::GenerateReply(&msg);
     reply->set_reply_error();
     Send(reply);
   }
 #endif
   return handled;
 }
 
-class ChildThreadImpl::ClientDiscardableSharedMemoryManagerDelegate
-    : public discardable_memory::ClientDiscardableSharedMemoryManager::
-          Delegate {
- public:
-  explicit ClientDiscardableSharedMemoryManagerDelegate(
-      scoped_refptr<ThreadSafeSender> sender)
-      : sender_(sender) {}
-  ~ClientDiscardableSharedMemoryManagerDelegate() override {}
-
-  void AllocateLockedDiscardableSharedMemory(
-      size_t size,
-      discardable_memory::DiscardableSharedMemoryId id,
-      base::SharedMemoryHandle* handle) override {
-    sender_->Send(
-        new ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory(
-            size, id, handle));
-  }
-
-  void DeletedDiscardableSharedMemory(
-      discardable_memory::DiscardableSharedMemoryId id) override {
-    sender_->Send(new ChildProcessHostMsg_DeletedDiscardableSharedMemory(id));
-  }
-
- private:
-  scoped_refptr<ThreadSafeSender> sender_;
-};
-
 ChildThreadImpl::ChildThreadImpl()
     : route_provider_binding_(this),
       associated_interface_provider_bindings_(
           mojo::BindingSetDispatchMode::WITH_CONTEXT),
       router_(this),
       channel_connected_factory_(
           new base::WeakPtrFactory<ChildThreadImpl>(this)),
       weak_factory_(this) {
   Init(Options::Builder().Build());
 }
 
 ChildThreadImpl::ChildThreadImpl(const Options& options)
     : route_provider_binding_(this),
       associated_interface_provider_bindings_(
           mojo::BindingSetDispatchMode::WITH_CONTEXT),
       router_(this),
       browser_process_io_runner_(options.browser_process_io_runner),
       channel_connected_factory_(
           new base::WeakPtrFactory<ChildThreadImpl>(this)),
       weak_factory_(this) {
   Init(options);
 }
 
-scoped_refptr<base::SequencedTaskRunner> ChildThreadImpl::GetIOTaskRunner() {
+scoped_refptr<base::SingleThreadTaskRunner> ChildThreadImpl::GetIOTaskRunner() {
   if (IsInBrowserProcess())
     return browser_process_io_runner_;
   return ChildProcess::current()->io_task_runner();
 }
 
 void ChildThreadImpl::ConnectChannel() {
   std::string channel_token;
   mojo::ScopedMessagePipeHandle handle;
   if (!IsInBrowserProcess()) {
     channel_token = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ skipping 167 matching lines @@
                             channel_connected_factory_->GetWeakPtr()),
       base::TimeDelta::FromSeconds(connection_timeout));
 
 #if defined(OS_ANDROID)
   g_quit_closure.Get().BindToMainThread();
 #endif
 
   shared_bitmap_manager_.reset(
       new ChildSharedBitmapManager(thread_safe_sender()));
 
-  client_discardable_shared_memory_manager_delegate_ =
-      base::MakeUnique<ClientDiscardableSharedMemoryManagerDelegate>(
-          thread_safe_sender());
-  discardable_shared_memory_manager_ = base::MakeUnique<
-      discardable_memory::ClientDiscardableSharedMemoryManager>(
-      client_discardable_shared_memory_manager_delegate_.get());
+  if (options.init_discardable_memory) {
+    discardable_memory::mojom::DiscardableSharedMemoryManagerPtr manager;
+    ChildThread::Get()->GetRemoteInterfaces()->GetInterface(
+        mojo::GetProxy(&manager));
+
+    discardable_shared_memory_manager_ = base::MakeUnique<
+        discardable_memory::ClientDiscardableSharedMemoryManager>(
+        manager.PassInterface(), GetIOTaskRunner().get());
+  }
 }
 
 ChildThreadImpl::~ChildThreadImpl() {
 #ifdef IPC_MESSAGE_LOG_ENABLED
   IPC::Logging::GetInstance()->SetIPCSender(NULL);
 #endif
 
   channel_->RemoveFilter(histogram_message_filter_.get());
   channel_->RemoveFilter(sync_message_filter_.get());
 
@@ skipping 303 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