Remote Assistance on Chrome OS Part III - NativeMessageHost

remoting/host/it2me/it2me_native_messaging_host_main.cc

 // Copyright 2013 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 "remoting/host/it2me/it2me_native_messaging_host_main.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "media/base/media.h"
 #include "net/socket/ssl_server_socket.h"
 #include "remoting/base/breakpad.h"
 #include "remoting/base/resources.h"
 #include "remoting/host/host_exit_codes.h"
 #include "remoting/host/it2me/it2me_native_messaging_host.h"
 #include "remoting/host/logging.h"
+#include "remoting/host/native_messaging/native_messaging_pipe.h"
 #include "remoting/host/native_messaging/pipe_messaging_channel.h"
 #include "remoting/host/usage_stats_consent.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #include <X11/Xlib.h>
 #endif  // defined(OS_LINUX)
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 81 matching lines @@
 
   base::MessageLoopForUI message_loop;
   base::RunLoop run_loop;
 
   scoped_refptr<AutoThreadTaskRunner> task_runner =
       new remoting::AutoThreadTaskRunner(message_loop.message_loop_proxy(),
                                          run_loop.QuitClosure());
 
   scoped_ptr<It2MeHostFactory> factory(new It2MeHostFactory());
 
+  scoped_ptr<NativeMessagingPipe> native_messaging_pipe(
+      new NativeMessagingPipe());
+
   // Set up the native messaging channel.
   scoped_ptr<extensions::NativeMessagingChannel> channel(
       new PipeMessagingChannel(read_file.Pass(), write_file.Pass()));
 
-  scoped_ptr<It2MeNativeMessagingHost> host(new It2MeNativeMessagingHost(
-      task_runner, channel.Pass(), factory.Pass()));
-  host->Start(run_loop.QuitClosure());
+  scoped_ptr<extensions::NativeMessageHost> host(new It2MeNativeMessagingHost(
+      task_runner,
+      0, // The |port_id| is not used in out-of-process host.
+      native_messaging_pipe->AsWeakPtr(),
+      factory.Pass()));
+
+  native_messaging_pipe->Init(host.Pass(), channel.Pass());
+
+  native_messaging_pipe->Start(run_loop.QuitClosure());
 
   // Run the loop until channel is alive.
   run_loop.Run();
 
   return kSuccessExitCode;
 }
 
 int It2MeNativeMessagingHostMain(int argc, char** argv) {
   // This object instance is required by Chrome code (such as MessageLoop).
   base::AtExitManager exit_manager;
 
   base::CommandLine::Init(argc, argv);
   remoting::InitHostLogging();
 
   return StartIt2MeNativeMessagingHost();
 }
 
 }  // namespace remoting