Simplify channel creation callbacks in remoting::Session interface.

remoting/protocol/jingle_session.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_H_
 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/task.h"
 #include "crypto/rsa_private_key.h"
@@ skipping 106 matching lines @@
   void OnChannelConnectorFinished(const std::string& name,
                                   JingleChannelConnector* connector);
 
   // Creates channels after session has been accepted.
   // TODO(sergeyu): Don't create channels in JingleSession.
   void CreateChannels();
 
   // Callbacks for the channels created in JingleSession.
   // TODO(sergeyu): Remove this method once *_channel() methods are
   // removed from Session interface.
-  void OnStreamChannelConnected(
-      const std::string& name, net::StreamSocket* socket);
-  void OnChannelConnected(const std::string& name, net::Socket* socket);
+  void OnChannelConnected(scoped_ptr<net::Socket>* socket_container,
+                          net::StreamSocket* socket);
 
   const cricket::ContentInfo* GetContentInfo() const;
 
   void SetState(State new_state);
 
   // JingleSessionManager that created this session. Guaranteed to
   // exist throughout the lifetime of the session.
   JingleSessionManager* jingle_session_manager_;
 
   // Certificates used for connection. Currently only receiving side
@@ skipping 46 matching lines @@
   ScopedRunnableMethodFactory<JingleSession> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_H_