Me2me Native Messaging host on Windows: restructure NativeMessagingHost and NativeMessagingChannel.…

remoting/host/setup/me2me_native_messaging_host_main.cc

Index: remoting/host/setup/me2me_native_messaging_host_main.cc
diff --git a/remoting/host/setup/me2me_native_messaging_host_main.cc b/remoting/host/setup/me2me_native_messaging_host_main.cc
index 91d8d9d8f631ea50d24b62a50993cb53844602d5..fbba4d3a8ccb2dec928e4ccf43942358e01add30 100644
--- a/remoting/host/setup/me2me_native_messaging_host_main.cc
+++ b/remoting/host/setup/me2me_native_messaging_host_main.cc
@@ -75,15 +75,12 @@ int NativeMessagingHostMain() {
   // Create the pairing registry and native messaging host.
   scoped_refptr<protocol::PairingRegistry> pairing_registry =
       CreatePairingRegistry(io_thread.message_loop_proxy());
-  scoped_ptr<NativeMessagingChannel::Delegate> host(
+
+  scoped_ptr<NativeMessagingHost> host(
       new NativeMessagingHost(daemon_controller,
                               pairing_registry,
                               oauth_client.Pass()));
-
-  // Set up the native messaging channel.
-  scoped_ptr<NativeMessagingChannel> channel(
-      new NativeMessagingChannel(host.Pass(), read_file, write_file));
-  channel->Start(run_loop.QuitClosure());
+  host->Start(read_file, write_file, run_loop.QuitClosure());
 
   // Run the loop until channel is alive.
   run_loop.Run();