Remote Assistance on Chrome OS Part II - Native Messaging renaming

remoting/host/it2me/it2me_native_messaging_host_main.cc

Index: remoting/host/it2me/it2me_native_messaging_host_main.cc
diff --git a/remoting/host/it2me/it2me_native_messaging_host_main.cc b/remoting/host/it2me/it2me_native_messaging_host_main.cc
index a8bff89223e56861e6e0672e46a33a1b95c9db25..298a745a617445b8120a2339ad5d336c0b581af1 100644
--- a/remoting/host/it2me/it2me_native_messaging_host_main.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host_main.cc
@@ -16,6 +16,7 @@
 #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/pipe_messaging_channel.h"
 #include "remoting/host/usage_stats_consent.h"
 
 #if defined(OS_LINUX)
@@ -117,12 +118,14 @@ int StartIt2MeNativeMessagingHost() {
   scoped_ptr<It2MeHostFactory> factory(new It2MeHostFactory());
 
   // Set up the native messaging channel.
-  scoped_ptr<NativeMessagingChannel> channel(
-      new NativeMessagingChannel(read_file.Pass(), write_file.Pass()));
+  scoped_ptr<PipeMessagingChannel> channel(

[Sergey Ulanov, 2014/09/18 18:08:35]

nit: define this as scoped_ptr<extensions::NativeMessagingChannel> then you
wouldn't need PassAs<>() below

[kelvinp, 2014/09/18 19:03:50]

Done.

+      new PipeMessagingChannel(read_file.Pass(), write_file.Pass()));
 
   scoped_ptr<It2MeNativeMessagingHost> host(
       new It2MeNativeMessagingHost(
-          task_runner, channel.Pass(), factory.Pass()));
+          task_runner,
+          channel.PassAs<extensions::NativeMessagingChannel>(),
+          factory.Pass()));
   host->Start(run_loop.QuitClosure());
 
   // Run the loop until channel is alive.