Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

content/browser/mojo/mojo_application_host.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 "content/browser/mojo/mojo_application_host.h"
 
 #include "content/common/mojo/mojo_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "ipc/ipc_sender.h"
 #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
@@ skipping 45 matching lines @@
 }
 
 MojoApplicationHost::~MojoApplicationHost() {
 }
 
 bool MojoApplicationHost::Init() {
   DCHECK(!client_handle_.is_valid()) << "Already initialized!";
 
   mojo::embedder::PlatformChannelPair channel_pair;
 
+  scoped_refptr<base::TaskRunner> io_task_runner;

[Hajime Morrita, 2015/03/02 23:27:26]

We could possibly pass the task runner to the ctor of this class.
We can make that change later though. Let's land this first.

+  if (io_task_runner_override_) {
+    io_task_runner = io_task_runner_override_;
+  } else {
+    io_task_runner =
+        BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
+          ->task_runner();
+  }
+
   mojo::ScopedMessagePipeHandle message_pipe = channel_init_.Init(
       PlatformFileFromScopedPlatformHandle(channel_pair.PassServerHandle()),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
+      io_task_runner);
   if (!message_pipe.is_valid())
     return false;
 
   // Forward this to the client once we know its process handle.
   client_handle_ = channel_pair.PassClientHandle();
 
   application_setup_.reset(new ApplicationSetupImpl(
       &service_registry_,
       mojo::MakeRequest<ApplicationSetup>(message_pipe.Pass())));
   return true;
 }
 
 void MojoApplicationHost::Activate(IPC::Sender* sender,
                                    base::ProcessHandle process_handle) {
   DCHECK(!did_activate_);
   DCHECK(client_handle_.is_valid());
 
   base::PlatformFile client_file =
       PlatformFileFromScopedPlatformHandle(client_handle_.Pass());
   did_activate_ = sender->Send(new MojoMsg_Activate(
       IPC::GetFileHandleForProcess(client_file, process_handle, true)));
 }
 
 void MojoApplicationHost::WillDestroySoon() {
   channel_init_.WillDestroySoon();
 }
 
+void MojoApplicationHost::OverrideIOTaskRunnerForTest(
+    scoped_refptr<base::TaskRunner> io_task_runner) {
+  io_task_runner_override_ = io_task_runner;
+}
+
 }  // namespace content