Revert "Send input event IPCs directly from the UI thread"

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index b8077b6a0997e7dde08094f5669c88dcfa50f31c..ec89c3f1601efbc237811fae03fc817af544990f 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -165,7 +165,6 @@
 #include "ipc/attachment_broker_privileged.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_logging.h"
-#include "ipc/ipc_sender.h"
 #include "ipc/ipc_switches.h"
 #include "ipc/mojo/ipc_channel_mojo.h"
 #include "media/base/media_switches.h"
@@ -449,25 +448,6 @@ std::string UintVectorToString(const std::vector<unsigned>& vector) {
 
 }  // namespace
 
-class RenderProcessHostImpl::SafeSenderProxy : public IPC::Sender {
- public:
-  // |process| must outlive this object.
-  explicit SafeSenderProxy(RenderProcessHostImpl* process, bool send_now)
-      : process_(process), send_now_(send_now) {}
-  ~SafeSenderProxy() override {}
-
-  // IPC::Sender:
-  bool Send(IPC::Message* message) override {
-    return process_->SendImpl(base::WrapUnique(message), send_now_);
-  }
-
- private:
-  RenderProcessHostImpl* const process_;
-  const bool send_now_;
-
-  DISALLOW_COPY_AND_ASSIGN(SafeSenderProxy);
-};
-
 RendererMainThreadFactoryFunction g_renderer_main_thread_factory = NULL;
 
 base::MessageLoop* g_in_process_thread;
@@ -557,8 +537,6 @@ RenderProcessHostImpl::RenderProcessHostImpl(
       is_self_deleted_(false),
 #endif
       pending_views_(0),
-      immediate_sender_(new SafeSenderProxy(this, true)),
-      io_thread_sender_(new SafeSenderProxy(this, false)),
       child_token_(mojo::edk::GenerateRandomToken()),
       mojo_application_host_(new MojoApplicationHost(child_token_)),
       visible_widgets_(0),
@@ -673,8 +651,10 @@ RenderProcessHostImpl::~RenderProcessHostImpl() {
 #endif
   // We may have some unsent messages at this point, but that's OK.
   channel_.reset();
-  while (!queued_messages_.empty())
+  while (!queued_messages_.empty()) {
+    delete queued_messages_.front();
     queued_messages_.pop();
+  }
 
   UnregisterHost(GetID());
 
@@ -1030,41 +1010,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
 #endif
 }
 
-bool RenderProcessHostImpl::SendImpl(std::unique_ptr<IPC::Message> msg,
-                                     bool send_now) {
-  TRACE_EVENT0("renderer_host", "RenderProcessHostImpl::SendImpl");
-#if !defined(OS_ANDROID)
-  DCHECK(!msg->is_sync());
-#endif
-
-  if (!channel_) {
-#if defined(OS_ANDROID)
-    if (msg->is_sync())
-      return false;
-#endif
-    if (!is_initialized_) {
-      queued_messages_.emplace(std::move(msg));
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  if (child_process_launcher_.get() && child_process_launcher_->IsStarting()) {
-#if defined(OS_ANDROID)
-    if (msg->is_sync())
-      return false;
-#endif
-    queued_messages_.emplace(std::move(msg));
-    return true;
-  }
-
-  if (send_now)
-    return channel_->SendNow(std::move(msg));
-
-  return channel_->SendOnIPCThread(std::move(msg));
-}
-
 void RenderProcessHostImpl::RegisterMojoServices() {
 #if !defined(OS_ANDROID)
   mojo_application_host_->service_registry()->AddService(
@@ -1705,7 +1650,39 @@ bool RenderProcessHostImpl::FastShutdownIfPossible() {
 }
 
 bool RenderProcessHostImpl::Send(IPC::Message* msg) {
-  return SendImpl(base::WrapUnique(msg), false /* send_now */);
+  TRACE_EVENT0("renderer_host", "RenderProcessHostImpl::Send");
+#if !defined(OS_ANDROID)
+  DCHECK(!msg->is_sync());
+#endif
+
+  if (!channel_) {
+#if defined(OS_ANDROID)
+    if (msg->is_sync()) {
+      delete msg;
+      return false;
+    }
+#endif
+    if (!is_initialized_) {
+      queued_messages_.push(msg);
+      return true;
+    } else {
+      delete msg;
+      return false;
+    }
+  }
+
+  if (child_process_launcher_.get() && child_process_launcher_->IsStarting()) {
+#if defined(OS_ANDROID)
+    if (msg->is_sync()) {
+      delete msg;
+      return false;
+    }
+#endif
+    queued_messages_.push(msg);
+    return true;
+  }
+
+  return channel_->Send(msg);
 }
 
 bool RenderProcessHostImpl::OnMessageReceived(const IPC::Message& msg) {
@@ -2065,14 +2042,6 @@ IPC::ChannelProxy* RenderProcessHostImpl::GetChannel() {
   return channel_.get();
 }
 
-IPC::Sender* RenderProcessHostImpl::GetImmediateSender() {
-  return immediate_sender_.get();
-}
-
-IPC::Sender* RenderProcessHostImpl::GetIOThreadSender() {
-  return io_thread_sender_.get();
-}
-
 void RenderProcessHostImpl::AddFilter(BrowserMessageFilter* filter) {
   channel_->AddFilter(filter->GetFilter());
 }
@@ -2418,8 +2387,10 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
       channel_.get());
 #endif
   channel_.reset();
-  while (!queued_messages_.empty())
+  while (!queued_messages_.empty()) {
+    delete queued_messages_.front();
     queued_messages_.pop();
+  }
   UpdateProcessPriority();
   DCHECK(!is_process_backgrounded_);
 
@@ -2597,7 +2568,7 @@ void RenderProcessHostImpl::OnProcessLaunched() {
                                          NotificationService::NoDetails());
 
   while (!queued_messages_.empty()) {
-    Send(queued_messages_.front().release());
+    Send(queued_messages_.front());
     queued_messages_.pop();
   }