Revert of ChannelMojo: Ensure that it always has ScopedIPCSupport

content/child/child_thread_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/child/child_thread_impl.h"
 
 #include <signal.h>
 
 #include <string>
 
@@ skipping 38 matching lines @@
 #include "content/child/thread_safe_sender.h"
 #include "content/child/websocket_dispatcher.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/in_process_child_thread_params.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "ipc/mojo/ipc_channel_mojo.h"
+#include "ipc/mojo/scoped_ipc_support.h"
 
 #if defined(OS_WIN)
 #include "content/common/handle_enumerator_win.h"
 #endif
 
 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
 #endif
 
 using tracked_objects::ThreadData;
@@ skipping 128 matching lines @@
 }
 
 #endif
 
 }  // namespace
 
 ChildThread* ChildThread::Get() {
   return ChildThreadImpl::current();
 }
 
+// Mojo client channel delegate to be used in single process mode.
+class ChildThreadImpl::SingleProcessChannelDelegate
+    : public IPC::ChannelMojo::Delegate {
+ public:
+  explicit SingleProcessChannelDelegate(
+      scoped_refptr<base::SequencedTaskRunner> io_runner)
+      : io_runner_(io_runner), weak_factory_(this) {}
+
+  ~SingleProcessChannelDelegate() override {}
+
+  base::WeakPtr<IPC::ChannelMojo::Delegate> ToWeakPtr() override {
+    return weak_factory_.GetWeakPtr();
+  }
+
+  scoped_refptr<base::TaskRunner> GetIOTaskRunner() override {
+    return io_runner_;
+  }
+
+  void OnChannelCreated(base::WeakPtr<IPC::ChannelMojo> channel) override {}
+
+  void DeleteSoon() {
+    io_runner_->PostTask(
+        FROM_HERE,
+        base::Bind(&base::DeletePointer<SingleProcessChannelDelegate>,
+                   base::Unretained(this)));
+  }
+
+ private:
+  scoped_refptr<base::SequencedTaskRunner> io_runner_;
+  base::WeakPtrFactory<IPC::ChannelMojo::Delegate> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(SingleProcessChannelDelegate);
+};
+
+void ChildThreadImpl::SingleProcessChannelDelegateDeleter::operator()(
+    SingleProcessChannelDelegate* delegate) const {
+  delegate->DeleteSoon();
+}
+
 ChildThreadImpl::Options::Options()
     : channel_name(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kProcessChannelID)),
       use_mojo_channel(false) {
 }
 
 ChildThreadImpl::Options::~Options() {
 }
 
 ChildThreadImpl::Options::Builder::Builder() {
@@ skipping 57 matching lines @@
     return browser_process_io_runner_;
   return ChildProcess::current()->io_message_loop_proxy();
 }
 
 void ChildThreadImpl::ConnectChannel(bool use_mojo_channel) {
   bool create_pipe_now = true;
   if (use_mojo_channel) {
     VLOG(1) << "Mojo is enabled on child";
     scoped_refptr<base::SequencedTaskRunner> io_task_runner = GetIOTaskRunner();
     DCHECK(io_task_runner);
-    channel_->Init(IPC::ChannelMojo::CreateClientFactory(
-                       nullptr, io_task_runner, channel_name_),
-                   create_pipe_now);
+    if (IsInBrowserProcess())
+      single_process_channel_delegate_.reset(
+          new SingleProcessChannelDelegate(io_task_runner));
+    ipc_support_.reset(new IPC::ScopedIPCSupport(io_task_runner));
+    channel_->Init(
+        IPC::ChannelMojo::CreateClientFactory(
+            single_process_channel_delegate_.get(),
+            channel_name_),
+        create_pipe_now);
     return;
   }
 
   VLOG(1) << "Mojo is disabled on child";
   channel_->Init(channel_name_, IPC::Channel::MODE_CLIENT, create_pipe_now);
 }
 
 void ChildThreadImpl::Init(const Options& options) {
   channel_name_ = options.channel_name;
 
@@ skipping 406 matching lines @@
   // doesn't cause such issues. TODO(gab): Remove this once the experiment is
   // over (http://crbug.com/458594).
   base::FieldTrial* trial =
       base::FieldTrialList::Find("BackgroundRendererProcesses");
   if (trial && trial->group_name() == "AllowBackgroundModeFromRenderer")
     base::Process::Current().SetProcessBackgrounded(background);
 #endif  // OS_WIN
 }
 
 }  // namespace content