[Chromoting] Make ChromotingHost's dependency on libjingle injected, instead of hard-coded.

remoting/host/simple_host_process.cc

 // Copyright (c) 2012 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.
 //
 // This is an application of a minimal host process in a Chromoting
 // system. It serves the purpose of gluing different pieces together
 // to make a functional host process for testing.
 //
 // It peforms the following functionality:
 // 1. Connect to the GTalk network and register the machine as a host.
@@ skipping 24 matching lines @@
 #include "remoting/host/capturer_fake.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/constants.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/heartbeat_sender.h"
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_secret.h"
 #include "remoting/host/it2me_host_user_interface.h"
+#include "remoting/host/jingle_session_manager_factory.h"
 #include "remoting/host/json_host_config.h"
 #include "remoting/host/log_to_server.h"
 #include "remoting/host/register_support_host_request.h"
 #include "remoting/host/signaling_connector.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/it2me_host_authenticator_factory.h"
 #include "remoting/protocol/me2me_host_authenticator_factory.h"
 
 #if defined(TOOLKIT_GTK)
@@ skipping 170 matching lines @@
       scoped_ptr<EventExecutor> event_executor =
           EventExecutor::Create(context_.desktop_message_loop(),
                                 context_.ui_message_loop(),
                                 capturer.get());
       desktop_environment_ = DesktopEnvironment::CreateFake(
           &context_, capturer.Pass(), event_executor.Pass());
     } else {
       desktop_environment_ = DesktopEnvironment::Create(&context_);
     }
 
+    scoped_ptr<SessionManagerFactory> session_manager_factory(
+        new JingleSessionManagerFactory());
+
     host_ = new ChromotingHost(&context_, signal_strategy_.get(),
-                               desktop_environment_.get(), network_settings_);
+                               desktop_environment_.get(),
+                               session_manager_factory.Pass(),

[Wez, 2012/06/11 22:17:06]

Pass the new object directly here?

[simonmorris, 2012/06/11 23:08:59]

Done.

+                               network_settings_);
 
     ServerLogEntry::Mode mode =
         is_it2me_ ? ServerLogEntry::IT2ME : ServerLogEntry::ME2ME;
     log_to_server_.reset(new LogToServer(host_, mode, signal_strategy_.get()));
 
     if (is_it2me_) {
       it2me_host_user_interface_.reset(new It2MeHostUserInterface(&context_));
       it2me_host_user_interface_->Start(
           host_,
           base::Bind(&ChromotingHost::Shutdown, host_, base::Closure()));
@@ skipping 160 matching lines @@
         max_port < 0 || max_port > 65535) {
       LOG(ERROR) << "Invalid max-port value: " << max_port
                  << ". Expected integer in range [0, 65535].";
       return 1;
     }
     simple_host.network_settings()->max_port = max_port;
   }
 
   return simple_host.Run();
 }