ChannelMojo: Bind the channel TaskRunner to the right thread

ipc/mojo/ipc_channel_mojo.cc

 // Copyright 2014 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 "ipc/mojo/ipc_channel_mojo.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <memory>
 #include <utility>
@@ skipping 205 matching lines @@
 // static
 scoped_ptr<ChannelFactory> ChannelMojo::CreateClientFactory(
     mojo::ScopedMessagePipeHandle handle) {
   return make_scoped_ptr(
       new MojoChannelFactory(std::move(handle), Channel::MODE_CLIENT));
 }
 
 ChannelMojo::ChannelMojo(mojo::ScopedMessagePipeHandle handle,
                          Mode mode,
                          Listener* listener)
-    : task_runner_(base::ThreadTaskRunnerHandle::Get()),
-      pipe_(handle.get()),
+    : pipe_(handle.get()),
       listener_(listener),
       waiting_connect_(true),
       weak_factory_(this) {
   // Create MojoBootstrap after all members are set as it touches
   // ChannelMojo from a different thread.
   bootstrap_ = MojoBootstrap::Create(std::move(handle), mode, this);
 }
 
 ChannelMojo::~ChannelMojo() {
   Close();
 }
 
 bool ChannelMojo::Connect() {
   base::AutoLock lock(lock_);
+  DCHECK(!task_runner_);
+  task_runner_ = base::ThreadTaskRunnerHandle::Get();
   DCHECK(!message_reader_);
   bootstrap_->Connect();
   return true;
 }
 
 void ChannelMojo::Close() {
   scoped_ptr<internal::MessagePipeReader, ReaderDeleter> reader;
   {
     base::AutoLock lock(lock_);
     if (!message_reader_)
@@ skipping 53 matching lines @@
     }
   }
 
   if (connected)
     listener_->OnChannelConnected(static_cast<int32_t>(GetPeerPID()));
   else
     OnPipeError();
 }
 
 void ChannelMojo::OnPipeError() {
+  DCHECK(task_runner_);
   if (task_runner_->RunsTasksOnCurrentThread()) {
     listener_->OnChannelError();
   } else {
     task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&ChannelMojo::OnPipeError, weak_factory_.GetWeakPtr()));
   }
 }
 
 bool ChannelMojo::Send(Message* message) {
@@ skipping 99 matching lines @@
     DCHECK(ok);
     if (!ok) {
       LOG(ERROR) << "Failed to add new Mojo handle.";
       return MOJO_RESULT_UNKNOWN;
     }
   }
   return MOJO_RESULT_OK;
 }
 
 }  // namespace IPC