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

remoting/host/chromoting_host.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.
 
 #include "remoting/host/chromoting_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/encoder.h"
 #include "remoting/base/encoder_row_based.h"
 #include "remoting/base/encoder_vp8.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/host_config.h"
-#include "remoting/host/host_port_allocator.h"
 #include "remoting/host/screen_recorder.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
-#include "remoting/protocol/jingle_session_manager.h"
-#include "remoting/protocol/libjingle_transport_factory.h"
 #include "remoting/protocol/session_config.h"
 
 using remoting::protocol::ConnectionToClient;
 using remoting::protocol::InputStub;
 
 namespace remoting {
 
 namespace {
 
 const net::BackoffEntry::Policy kDefaultBackoffPolicy = {
@@ skipping 21 matching lines @@
   // Don't use initial delay unless the last request was an error.
   false,
 };
 
 }  // namespace
 
 ChromotingHost::ChromotingHost(
     ChromotingHostContext* context,
     SignalStrategy* signal_strategy,
     DesktopEnvironment* environment,
+    scoped_ptr<SessionManagerFactory> session_manager_factory,
     const NetworkSettings& network_settings)
     : context_(context),
       desktop_environment_(environment),
+      session_manager_factory_(session_manager_factory.release()),

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

release() -> Pass()

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

Done.

       network_settings_(network_settings),
       signal_strategy_(signal_strategy),
       stopping_recorders_(0),
       state_(kInitial),
       protocol_config_(protocol::CandidateSessionConfig::CreateDefault()),
       login_backoff_(&kDefaultBackoffPolicy),
       authenticating_client_(false),
       reject_authenticating_client_(false) {
   DCHECK(context_);
   DCHECK(signal_strategy);
   DCHECK(desktop_environment_);
   DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
 }
 
 ChromotingHost::~ChromotingHost() {
   DCHECK(clients_.empty());
 }
 
 void ChromotingHost::Start() {
   DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
 
   LOG(INFO) << "Starting host";
 
   // Make sure this object is not started.
   if (state_ != kInitial)
     return;
   state_ = kStarted;
 
-  // Create port allocator and transport factory.
-  scoped_ptr<HostPortAllocator> port_allocator(
-      HostPortAllocator::Create(context_->url_request_context_getter(),
-                                network_settings_));
-
-  bool incoming_only = network_settings_.nat_traversal_mode ==
-      NetworkSettings::NAT_TRAVERSAL_DISABLED;
-
-  scoped_ptr<protocol::TransportFactory> transport_factory(
-      new protocol::LibjingleTransportFactory(
-          port_allocator.PassAs<cricket::HttpPortAllocatorBase>(),
-          incoming_only));
-
   // Create and start session manager.
-  bool fetch_stun_relay_info = network_settings_.nat_traversal_mode ==
-      NetworkSettings::NAT_TRAVERSAL_ENABLED;
-  session_manager_.reset(new protocol::JingleSessionManager(
-      transport_factory.Pass(), fetch_stun_relay_info));
+  session_manager_.reset(session_manager_factory_->MakeSessionManager(
+      network_settings_, context_->url_request_context_getter()).release());

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

release() -> Pass()

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

This is a release()-reset() pair, so I don't think Pass() is right.

swap() would be cleaner, but maybe it's too indirect.

[Wez, 2012/06/12 21:20:10]

Right - it should be session_manager_ = ___.Pass();

[simonmorris, 2012/06/13 16:26:33]

Done.

   session_manager_->Init(signal_strategy_, this);
 }
 
 // This method is called when we need to destroy the host process.
 void ChromotingHost::Shutdown(const base::Closure& shutdown_task) {
   if (!context_->network_message_loop()->BelongsToCurrentThread()) {
     context_->network_message_loop()->PostTask(
         FROM_HERE, base::Bind(&ChromotingHost::Shutdown, this, shutdown_task));
     return;
   }
@@ skipping 322 matching lines @@
                     OnShutdown());
 
   for (std::vector<base::Closure>::iterator it = shutdown_tasks_.begin();
        it != shutdown_tasks_.end(); ++it) {
     it->Run();
   }
   shutdown_tasks_.clear();
 }
 
 }  // namespace remoting