Cleanup ConnectionToHost of non-P2P-API code.

BUG=74951
TEST=Compiles

Review URL: http://codereview.chromium.org/7981026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102311 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 46 deletions

diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index a816ac3..4a30688 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -30,17 +30,9 @@ 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),
@@ -80,7 +72,6 @@ void ConnectionToHost::Connect(scoped_refptr<XmppProxy> xmpp_proxy,
   host_jid_ = host_jid;
   host_public_key_ = host_public_key;
 
-  // Initialize |signal_strategy_|.
   JavascriptSignalStrategy* strategy = new JavascriptSignalStrategy(your_jid);
   strategy->AttachXmppProxy(xmpp_proxy);
   signal_strategy_.reset(strategy);
@@ -112,22 +103,7 @@ void ConnectionToHost::Disconnect(const base::Closure& shutdown_task) {
 void ConnectionToHost::InitSession() {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
-  // Initialize |session_manager_|.
-  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_);
 }
@@ -196,7 +172,6 @@ void ConnectionToHost::OnSessionStateChange(
       break;
 
     case Session::CONNECTED:
-      // Initialize reader and writer.
       video_reader_.reset(
           VideoReader::Create(message_loop_, session_->config()));
       video_reader_->Init(
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h
index f2f7c72..c8c1b44 100644
--- a/remoting/protocol/connection_to_host.h
+++ b/remoting/protocol/connection_to_host.h
@@ -25,16 +25,9 @@ namespace pp {
 class Instance;
 }  // namespace pp
 
-namespace talk_base {
-class NetworkManager;
-class PacketSocketFactory;
-}  // namespace talk_base
-
 namespace remoting {
 
 class JingleThread;
-class HostResolverFactory;
-class PortAllocatorSessionFactory;
 class XmppProxy;
 class VideoPacket;
 
@@ -76,16 +69,8 @@ class ConnectionToHost : public SignalStrategy::StatusObserver,
     virtual void OnConnectionFailed(ConnectionToHost* conn) = 0;
   };
 
-  // Takes ownership of |network_manager| and |socket_factory|. Both
-  // |network_manager| and |socket_factory| may be set to NULL.
-  //
-  // TODO(sergeyu): Constructor shouldn't need thread here.
-  ConnectionToHost(base::MessageLoopProxy* network_message_loop,
+  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);
   virtual ~ConnectionToHost();
 
@@ -146,10 +131,6 @@ class ConnectionToHost : public SignalStrategy::StatusObserver,
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   pp::Instance* pp_instance_;
-  scoped_ptr<talk_base::NetworkManager> network_manager_;
-  scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
-  scoped_ptr<HostResolverFactory> host_resolver_factory_;
-  scoped_ptr<PortAllocatorSessionFactory> port_allocator_session_factory_;
   bool allow_nat_traversal_;
 
   std::string host_jid_;