Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / child / child_thread.cc

diff --git a/src/content/child/child_thread.cc b/src/content/child/child_thread.cc
index a9a2fb6..34e7491 100644 (file)
--- a/src/content/child/child_thread.cc
+++ b/src/content/child/child_thread.cc
@@ -213,15 +213,15 @@ bool ChildThread::ChildThreadMessageRouter::Send(IPC::Message* msg) {
 
 ChildThread::ChildThread()
     : router_(this),
-      channel_connected_factory_(this),
-      in_browser_process_(false) {
+      in_browser_process_(false),
+      channel_connected_factory_(this) {
   Init(Options());
 }
 
 ChildThread::ChildThread(const Options& options)
     : router_(this),
-      channel_connected_factory_(this),
-      in_browser_process_(true) {
+      in_browser_process_(true),
+      channel_connected_factory_(this) {
   Init(options);
 }
 
@@ -229,10 +229,7 @@ scoped_ptr<IPC::SyncChannel> ChildThread::CreateChannel(bool use_mojo_channel) {
   if (use_mojo_channel) {
     VLOG(1) << "Mojo is enabled on child";
     return IPC::SyncChannel::Create(
-        IPC::ChannelMojo::CreateFactory(
-            channel_name_,
-            IPC::Channel::MODE_CLIENT,
-            ChildProcess::current()->io_message_loop_proxy()),
+        IPC::ChannelMojo::CreateClientFactory(channel_name_),
         this,
         ChildProcess::current()->io_message_loop_proxy(),
         true,