Minor cleanups in JingleSession and JingleSessionManager.

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.h"
 #include "remoting/base/constants.h"
@@ skipping 68 matching lines @@
 void ConnectionToHost::Disconnect(const base::Closure& shutdown_task) {
   if (MessageLoop::current() != message_loop_) {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&ConnectionToHost::Disconnect,
                               base::Unretained(this), shutdown_task));
     return;
   }
 
   CloseChannels();
 
-  if (session_.get()) {
-    session_->Close();
+  if (session_.get())
     session_.reset();
-  }
 
-  if (session_manager_.get()) {
-    session_manager_->Close();
+  if (session_manager_.get())
     session_manager_.reset();
-  }
 
-  if (signal_strategy_.get()) {
-    signal_strategy_->Close();
+  if (signal_strategy_.get())
     signal_strategy_.reset();
-  }
 
   shutdown_task.Run();
 }
 
 void ConnectionToHost::InitSession() {
   DCHECK_EQ(message_loop_, MessageLoop::current());
 
   // Initialize chromotocol |session_manager_|.
   JingleSessionManager* session_manager =
-      new JingleSessionManager(network_manager_.release(),
-                               socket_factory_.release(),
-                               port_allocator_session_factory_.release());
+      JingleSessionManager::CreateSandboxed(
+          network_manager_.release(), socket_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->Init(
       local_jid_, signal_strategy_.get(),
       NewCallback(this, &ConnectionToHost::OnNewSession), NULL, NULL);
   session_manager_.reset(session_manager);
 
   CandidateSessionConfig* candidate_config =
       CandidateSessionConfig::CreateDefault();
@@ skipping 88 matching lines @@
   // Create and enable the input stub now that we're authenticated.
   input_sender_.reset(new InputSender(session_->event_channel()));
 }
 
 ConnectionToHost::State ConnectionToHost::state() const {
   return state_;
 }
 
 }  // namespace protocol
 }  // namespace remoting