Cleanup ConnectionToHost of non-P2P-API code.

remoting/protocol/connection_to_host.cc

 // Copyright (c) 2011 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/protocol/connection_to_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop_proxy.h"
 #include "remoting/base/constants.h"
@@ skipping 11 matching lines @@
 #include "remoting/protocol/video_reader.h"
 #include "remoting/protocol/video_stub.h"
 #include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
 
 ConnectionToHost::ConnectionToHost(
     base::MessageLoopProxy* message_loop,
     pp::Instance* pp_instance,
-    talk_base::NetworkManager* network_manager,
-    talk_base::PacketSocketFactory* socket_factory,
-    HostResolverFactory* host_resolver_factory,
-    PortAllocatorSessionFactory* session_factory,
     bool allow_nat_traversal)
     : message_loop_(message_loop),
       pp_instance_(pp_instance),
-      network_manager_(network_manager),
-      socket_factory_(socket_factory),
-      host_resolver_factory_(host_resolver_factory),
-      port_allocator_session_factory_(session_factory),
       allow_nat_traversal_(allow_nat_traversal),
       event_callback_(NULL),
       client_stub_(NULL),
       video_stub_(NULL),
       state_(STATE_EMPTY),
       control_connected_(false),
       input_connected_(false),
       video_connected_(false) {
 }
 
@@ skipping 51 matching lines @@
 
   if (signal_strategy_.get())
     signal_strategy_.reset();
 
   shutdown_task.Run();
 }
 
 void ConnectionToHost::InitSession() {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
   // Initialize |session_manager_|.

[Wez, 2011/09/22 13:49:45]

nit: This code is now so beautifully simple that this comment adds nothing. ;)

[Sergey Ulanov, 2011/09/22 18:12:00]

Done.

-  if (pp_instance_) {
-    session_manager_.reset(new PepperSessionManager(pp_instance_));
-  } else {
-    JingleSessionManager* session_manager =
-        JingleSessionManager::CreateSandboxed(
-            message_loop_, network_manager_.release(),
-            socket_factory_.release(), host_resolver_factory_.release(),
-            port_allocator_session_factory_.release());
-
-    // TODO(ajwong): Make this a command switch when we're more stable.
-    session_manager->set_allow_local_ips(true);
-
-    session_manager_.reset(session_manager);
-  }
+  session_manager_.reset(new PepperSessionManager(pp_instance_));
 
   session_manager_->Init(
       local_jid_, signal_strategy_.get(), this, NULL, "", allow_nat_traversal_);
 }
 
 const SessionConfig& ConnectionToHost::config() {
   return session_->config();
 }
 
 void ConnectionToHost::OnStateChange(
@@ skipping 124 matching lines @@
   input_sender_.reset(
       new InputSender(message_loop_, session_->event_channel()));
 }
 
 ConnectionToHost::State ConnectionToHost::state() const {
   return state_;
 }
 
 }  // namespace protocol
 }  // namespace remoting