Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(407)

Unified Diff: remoting/protocol/jingle_session.h

Issue 7289032: Remove SocketWrapper to expose the threading issues it masks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase once more. Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session.h
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index b05fcf61f557bd469959ad884459e9064ea11094..c011e88408262bbb70fc3c7d28182f90db5e907f 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -32,7 +32,6 @@ 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
@@ -194,19 +193,16 @@ class JingleSession : public protocol::Session,
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_;
« no previous file with comments | « no previous file | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698