Move Mojo channel initialization closer to IPC::Channel setup

content/child/child_thread.cc

Index: content/child/child_thread.cc
diff --git a/content/child/child_thread.cc b/content/child/child_thread.cc
index 72be9fba30678ed1e49a9cec6b18d4e0166d84e0..ad28af80b5d019b005a9d45befb6376cc14edad3 100644
--- a/content/child/child_thread.cc
+++ b/content/child/child_thread.cc
@@ -198,7 +198,8 @@ bool ChildThread::ChildThreadMessageRouter::Send(IPC::Message* msg) {
 }
 
 ChildThread::ChildThread()
-    : router_(this),
+    : mojo_application_(this),
+      router_(this),
       channel_connected_factory_(this),
       in_browser_process_(false) {
   channel_name_ = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ -207,7 +208,8 @@ ChildThread::ChildThread()
 }
 
 ChildThread::ChildThread(const std::string& channel_name)
-    : channel_name_(channel_name),
+    : mojo_application_(this),
+      channel_name_(channel_name),
       router_(this),
       channel_connected_factory_(this),
       in_browser_process_(true) {
@@ -349,6 +351,12 @@ void ChildThread::OnChannelError() {
   base::MessageLoop::current()->Quit();
 }
 
+void ChildThread::AcceptConnection(
+    const mojo::String& service_name,
+    mojo::ScopedMessagePipeHandle message_pipe) {
+  // By default, we handle no services.

[sky, 2014/04/22 15:52:20]

If we get here does it mean someone is sending the wrong thing to a thread?
Should we take more evasive action?

+}
+
 bool ChildThread::Send(IPC::Message* msg) {
   DCHECK(base::MessageLoop::current() == message_loop());
   if (!channel_) {