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

remoting/host/setup/me2me_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 "base/strings/string_number_conversions.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 57 matching lines @@
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter(
       new URLRequestContextGetter(io_thread.message_loop_proxy()));
   scoped_ptr<OAuthClient> oauth_client(
       new OAuthClient(url_request_context_getter));
 
   net::URLFetcher::SetIgnoreCertificateRequests(true);
 
   // 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(
-      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());
+      new NativeMessagingChannel(read_file, write_file));
+
+  scoped_ptr<NativeMessagingHost> host(
+      new NativeMessagingHost(channel.Pass(),
+                              daemon_controller,
+                              pairing_registry,
+                              oauth_client.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::NativeMessagingHostMain();
 }