Remove SocketWrapper to expose the threading issues it masks.

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 14 matching lines @@
 class Socket;
 class StreamSocket;
 class X509Certificate;
 }  // namespace net
 
 namespace remoting {
 
 namespace protocol {
 
 class JingleSessionManager;
-class SocketWrapper;
 
 // Implements protocol::Session that work over libjingle session (the
 // cricket::Session object is passed to Init() method). Created
 // by JingleSessionManager for incoming and outgoing connections.
 class JingleSession : public protocol::Session,
                       public sigslot::has_slots<> {
  public:
   static const char kChromotingContentName[];
 
   // Chromotocol Session interface.
@@ skipping 141 matching lines @@
   // and runs the SSL protocol over it.  Finally |foo_socket_wrapper_| takes
   // ownership of |foo_ssl_socket_|, wrapping it with a SocketWrapper to work
   // around issues with callers of the resulting Sockets continuing to access
   // them after CloseInternal() has completed.
   // TODO(wez): Fix the tear-down issue and remove SocketWrapper.
 
   cricket::TransportChannel* raw_control_channel_;
   scoped_ptr<jingle_glue::TransportChannelSocketAdapter> control_channel_;
   scoped_ptr<net::StreamSocket> control_socket_;
   scoped_ptr<net::StreamSocket> control_ssl_socket_;
-  scoped_ptr<SocketWrapper> control_socket_wrapper_;
 
   cricket::TransportChannel* raw_event_channel_;
   scoped_ptr<jingle_glue::TransportChannelSocketAdapter> event_channel_;
   scoped_ptr<net::StreamSocket> event_socket_;
   scoped_ptr<net::StreamSocket> event_ssl_socket_;
-  scoped_ptr<SocketWrapper> event_socket_wrapper_;
 
   cricket::TransportChannel* raw_video_channel_;
   scoped_ptr<jingle_glue::TransportChannelSocketAdapter> video_channel_;
   scoped_ptr<net::StreamSocket> video_socket_;
   scoped_ptr<net::StreamSocket> video_ssl_socket_;
-  scoped_ptr<SocketWrapper> video_socket_wrapper_;
 
   // Used to verify the certificate received in SSLClientSocket.
   scoped_ptr<net::CertVerifier> cert_verifier_;
 
   cricket::TransportChannel* raw_video_rtp_channel_;
   scoped_ptr<jingle_glue::TransportChannelSocketAdapter> video_rtp_channel_;
   cricket::TransportChannel* raw_video_rtcp_channel_;
   scoped_ptr<jingle_glue::TransportChannelSocketAdapter> video_rtcp_channel_;
 
   // Callback called by the SSL layer.
   net::CompletionCallbackImpl<JingleSession> connect_callback_;
   net::CompletionCallbackImpl<JingleSession> ssl_connect_callback_;
 
   ScopedRunnableMethodFactory<JingleSession> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_H_