Revert of Move content's shell connections to the IO thread

content/browser/utility_process_host_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/browser/utility_process_host_impl.h"
 
 #include <utility>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 154 matching lines @@
       child_flags_(ChildProcessHost::CHILD_NORMAL),
 #endif
       started_(false),
       name_(base::ASCIIToUTF16("utility process")),
       child_token_(mojo::edk::GenerateRandomToken()),
       weak_ptr_factory_(this) {
   process_.reset(new BrowserChildProcessHostImpl(PROCESS_TYPE_UTILITY, this,
                                                  child_token_));
   mojo_child_connection_.reset(new MojoChildConnection(
       kUtilityMojoApplicationName,
-      base::StringPrintf("%d_0", process_->GetData().id), child_token_,
-      MojoShellContext::GetConnectorForIOThread(),
-      BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
-          ->task_runner()));
+      base::StringPrintf("%d_0", process_->GetData().id),
+      child_token_,
+      MojoShellContext::GetConnectorForIOThread()));
 }
 
 UtilityProcessHostImpl::~UtilityProcessHostImpl() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (is_batch_mode_)
     EndBatchMode();
 }
 
 base::WeakPtr<UtilityProcessHost> UtilityProcessHostImpl::AsWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
@@ skipping 44 matching lines @@
   env_ = env;
 }
 
 #endif  // OS_POSIX
 
 bool UtilityProcessHostImpl::Start() {
   return StartProcess();
 }
 
 shell::InterfaceRegistry* UtilityProcessHostImpl::GetInterfaceRegistry() {
-  return mojo_child_connection_->GetInterfaceRegistry();
+  return mojo_child_connection_->connection()->GetInterfaceRegistry();
 }
 
 shell::InterfaceProvider* UtilityProcessHostImpl::GetRemoteInterfaces() {
-  return mojo_child_connection_->GetRemoteInterfaces();
+  return mojo_child_connection_->connection()->GetRemoteInterfaces();
 }
 
 void UtilityProcessHostImpl::SetName(const base::string16& name) {
   name_ = name;
 }
 
 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 // static
 void UtilityProcessHostImpl::EarlyZygoteLaunch() {
   DCHECK(!g_utility_zygote);
@@ skipping 167 matching lines @@
     base::WeakPtr<UtilityProcessHostImpl> host,
     int error_code) {
   if (!host)
     return;
 
   host->OnProcessLaunchFailed(error_code);
   delete host.get();
 }
 
 }  // namespace content