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

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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "remoting/host/it2me/it2me_native_messaging_host.h"
 #include "remoting/host/logging.h"
@@ skipping 18 matching lines @@
 #endif
 
   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<NativeMessagingChannel::Delegate> host(
-      new It2MeNativeMessagingHost(task_runner, factory.Pass()));
-
-  NativeMessagingChannel::Delegate* host_ptr = host.get();
 
   // Set up the native messaging channel.
   scoped_ptr<NativeMessagingChannel> channel(
-      new NativeMessagingChannel(host.Pass(), read_file, write_file));
-  channel->Start(base::Bind(&It2MeNativeMessagingHost::ShutDownHost,
-                            base::Unretained(host_ptr)));
+      new NativeMessagingChannel(read_file, write_file));
+
+  scoped_ptr<It2MeNativeMessagingHost> host(
+      new It2MeNativeMessagingHost(
+          task_runner, channel.Pass(), factory.Pass()));
+  host->Start(run_loop.QuitClosure());
 
   // Run the loop until channel is alive.
   run_loop.Run();
   return kSuccessExitCode;
 }
 
 }  // namespace remoting
 
 int main(int argc, char** argv) {
   // This object instance is required by Chrome code (such as MessageLoop).
   base::AtExitManager exit_manager;
 
   CommandLine::Init(argc, argv);
   remoting::InitHostLogging();
 
   return remoting::It2MeNativeMessagingHostMain();
 }