Cleanup IPC::ChannelProxy to use SingleThreadTaskRunner

ipc/ipc_channel_proxy.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 "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 
 namespace IPC {
 
 //------------------------------------------------------------------------------
 
@@ skipping 15 matching lines @@
 
 void ChannelProxy::MessageFilter::OnDestruct() const {
   delete this;
 }
 
 ChannelProxy::MessageFilter::~MessageFilter() {}
 
 //------------------------------------------------------------------------------
 
 ChannelProxy::Context::Context(Listener* listener,
-                               base::MessageLoopProxy* ipc_message_loop)
-    : listener_message_loop_(base::MessageLoopProxy::current()),
+                               base::SingleThreadTaskRunner* ipc_task_runner)
+    : listener_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       listener_(listener),
-      ipc_message_loop_(ipc_message_loop),
+      ipc_task_runner_(ipc_task_runner),
       channel_connected_called_(false),
       peer_pid_(base::kNullProcessId) {
+  DCHECK(ipc_task_runner_);
 }
 
 ChannelProxy::Context::~Context() {
 }
 
+void ChannelProxy::Context::ClearIPCTaskRunner() {
+  ipc_task_runner_ = NULL;
+}
+
 void ChannelProxy::Context::CreateChannel(const IPC::ChannelHandle& handle,
                                           const Channel::Mode& mode) {
   DCHECK(channel_.get() == NULL);
   channel_id_ = handle.name;
   channel_.reset(new Channel(handle, mode, this));
 }
 
 bool ChannelProxy::Context::TryFilters(const Message& message) {
 #ifdef IPC_MESSAGE_LOG_ENABLED
   Logging* logger = Logging::GetInstance();
@@ skipping 20 matching lines @@
     OnMessageReceivedNoFilter(message);
   return true;
 }
 
 // Called on the IPC::Channel thread
 bool ChannelProxy::Context::OnMessageReceivedNoFilter(const Message& message) {
   // NOTE: This code relies on the listener's message loop not going away while
   // this thread is active.  That should be a reasonable assumption, but it
   // feels risky.  We may want to invent some more indirect way of referring to
   // a MessageLoop if this becomes a problem.
-  listener_message_loop_->PostTask(
+  listener_task_runner_->PostTask(
       FROM_HERE, base::Bind(&Context::OnDispatchMessage, this, message));
   return true;
 }
 
 // Called on the IPC::Channel thread
 void ChannelProxy::Context::OnChannelConnected(int32 peer_pid) {
   // Add any pending filters.  This avoids a race condition where someone
   // creates a ChannelProxy, calls AddFilter, and then right after starts the
   // peer process.  The IO thread could receive a message before the task to add
   // the filter is run on the IO thread.
   OnAddFilter();
 
   // We cache off the peer_pid so it can be safely accessed from both threads.
   peer_pid_ = channel_->peer_pid();
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnChannelConnected(peer_pid);
 
-  // See above comment about using listener_message_loop_ here.
-  listener_message_loop_->PostTask(
+  // See above comment about using listener_task_runner_ here.
+  listener_task_runner_->PostTask(
       FROM_HERE, base::Bind(&Context::OnDispatchConnected, this));
 }
 
 // Called on the IPC::Channel thread
 void ChannelProxy::Context::OnChannelError() {
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnChannelError();
 
-  // See above comment about using listener_message_loop_ here.
-  listener_message_loop_->PostTask(
+  // See above comment about using listener_task_runner_ here.
+  listener_task_runner_->PostTask(
       FROM_HERE, base::Bind(&Context::OnDispatchError, this));
 }
 
 // Called on the IPC::Channel thread
 void ChannelProxy::Context::OnChannelOpened() {
   DCHECK(channel_ != NULL);
 
   // Assume a reference to ourselves on behalf of this thread.  This reference
   // will be released when we are closed.
   AddRef();
@@ skipping 70 matching lines @@
     }
   }
 
   NOTREACHED() << "filter to be removed not found";
 }
 
 // Called on the listener's thread
 void ChannelProxy::Context::AddFilter(MessageFilter* filter) {
   base::AutoLock auto_lock(pending_filters_lock_);
   pending_filters_.push_back(make_scoped_refptr(filter));
-  ipc_message_loop_->PostTask(
+  ipc_task_runner_->PostTask(
       FROM_HERE, base::Bind(&Context::OnAddFilter, this));
 }
 
 // Called on the listener's thread
 void ChannelProxy::Context::OnDispatchMessage(const Message& message) {
 #ifdef IPC_MESSAGE_LOG_ENABLED
   Logging* logger = Logging::GetInstance();
   std::string name;
   logger->GetMessageText(message.type(), &name, &message, NULL);
   TRACE_EVENT1("task", "ChannelProxy::Context::OnDispatchMessage",
@@ skipping 41 matching lines @@
 void ChannelProxy::Context::OnDispatchError() {
   if (listener_)
     listener_->OnChannelError();
 }
 
 //-----------------------------------------------------------------------------
 
 ChannelProxy::ChannelProxy(const IPC::ChannelHandle& channel_handle,
                            Channel::Mode mode,
                            Listener* listener,
-                           base::MessageLoopProxy* ipc_thread)
-    : context_(new Context(listener, ipc_thread)),
+                           base::SingleThreadTaskRunner* ipc_task_runner)
+    : context_(new Context(listener, ipc_task_runner)),
       outgoing_message_filter_(NULL),
       did_init_(false) {
   Init(channel_handle, mode, true);
 }
 
 ChannelProxy::ChannelProxy(Context* context)
     : context_(context),
       outgoing_message_filter_(NULL),
       did_init_(false) {
 }
@@ skipping 16 matching lines @@
   }
 #endif  // defined(OS_POSIX)
 
   if (create_pipe_now) {
     // Create the channel immediately.  This effectively sets up the
     // low-level pipe so that the client can connect.  Without creating
     // the pipe immediately, it is possible for a listener to attempt
     // to connect and get an error since the pipe doesn't exist yet.
     context_->CreateChannel(channel_handle, mode);
   } else {
-    context_->ipc_message_loop()->PostTask(
+    context_->ipc_task_runner()->PostTask(
         FROM_HERE, base::Bind(&Context::CreateChannel, context_.get(),
                               channel_handle, mode));
   }
 
   // complete initialization on the background thread
-  context_->ipc_message_loop()->PostTask(
+  context_->ipc_task_runner()->PostTask(
       FROM_HERE, base::Bind(&Context::OnChannelOpened, context_.get()));
 
   did_init_ = true;
 }
 
 void ChannelProxy::Close() {
   // Clear the backpointer to the listener so that any pending calls to
   // Context::OnDispatchMessage or OnDispatchError will be ignored.  It is
   // possible that the channel could be closed while it is receiving messages!
   context_->Clear();
 
-  if (context_->ipc_message_loop()) {
-    context_->ipc_message_loop()->PostTask(
+  if (context_->ipc_task_runner()) {
+    context_->ipc_task_runner()->PostTask(
         FROM_HERE, base::Bind(&Context::OnChannelClosed, context_.get()));
   }
 }
 
 bool ChannelProxy::Send(Message* message) {
   DCHECK(did_init_);
   if (outgoing_message_filter())
     message = outgoing_message_filter()->Rewrite(message);
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
   Logging::GetInstance()->OnSendMessage(message, context_->channel_id());
 #endif
 
-  context_->ipc_message_loop()->PostTask(
+  context_->ipc_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&ChannelProxy::Context::OnSendMessage,
                  context_, base::Passed(scoped_ptr<Message>(message))));
   return true;
 }
 
 void ChannelProxy::AddFilter(MessageFilter* filter) {
   context_->AddFilter(filter);
 }
 
 void ChannelProxy::RemoveFilter(MessageFilter* filter) {
-  context_->ipc_message_loop()->PostTask(
+  context_->ipc_task_runner()->PostTask(
       FROM_HERE, base::Bind(&Context::OnRemoveFilter, context_.get(),
                             make_scoped_refptr(filter)));
 }
 
-void ChannelProxy::ClearIPCMessageLoop() {
-  context()->ClearIPCMessageLoop();
+void ChannelProxy::ClearIPCTaskRunner() {
+  context()->ClearIPCTaskRunner();
 }
 
 #if defined(OS_POSIX) && !defined(OS_NACL)
 // See the TODO regarding lazy initialization of the channel in
 // ChannelProxy::Init().
 int ChannelProxy::GetClientFileDescriptor() {
   Channel* channel = context_.get()->channel_.get();
   // Channel must have been created first.
   DCHECK(channel) << context_.get()->channel_id_;
   return channel->GetClientFileDescriptor();
@@ skipping 10 matching lines @@
   Channel* channel = context_.get()->channel_.get();
   // Channel must have been created first.
   DCHECK(channel) << context_.get()->channel_id_;
   return channel->GetClientEuid(client_euid);
 }
 #endif
 
 //-----------------------------------------------------------------------------
 
 }  // namespace IPC