| Index: webrtc/p2p/base/session.cc
|
| diff --git a/webrtc/p2p/base/session.cc b/webrtc/p2p/base/session.cc
|
| index fb8480ee5e347e51234c3d59f5756505ff264e26..6c185113f9226e0d5bc9b4e48832fe7cc2805aa4 100644
|
| --- a/webrtc/p2p/base/session.cc
|
| +++ b/webrtc/p2p/base/session.cc
|
| @@ -37,10 +37,6 @@ TransportProxy::~TransportProxy() {
|
| }
|
| }
|
|
|
| -const std::string& TransportProxy::type() const {
|
| - return transport_->get()->type();
|
| -}
|
| -
|
| TransportChannel* TransportProxy::GetChannel(int component) {
|
| ASSERT(rtc::Thread::Current() == worker_thread_);
|
| return GetChannelProxy(component);
|
| @@ -339,7 +335,6 @@ BaseSession::BaseSession(rtc::Thread* signaling_thread,
|
| port_allocator_(port_allocator),
|
| sid_(sid),
|
| content_type_(content_type),
|
| - transport_type_(NS_GINGLE_P2P),
|
| initiator_(initiator),
|
| identity_(NULL),
|
| ssl_max_version_(rtc::SSL_PROTOCOL_DTLS_10),
|
| @@ -578,7 +573,6 @@ void BaseSession::DestroyTransportProxy(
|
| }
|
|
|
| Transport* BaseSession::CreateTransport(const std::string& content_name) {
|
| - ASSERT(transport_type_ == NS_GINGLE_P2P);
|
| Transport* transport = new DtlsTransport<P2PTransport>(
|
| signaling_thread(), worker_thread(), content_name, port_allocator(),
|
| identity_);
|
| @@ -778,8 +772,7 @@ void BaseSession::LogState(State old_state, State new_state) {
|
| LOG(LS_INFO) << "Session:" << id()
|
| << " Old state:" << StateToString(old_state)
|
| << " New state:" << StateToString(new_state)
|
| - << " Type:" << content_type()
|
| - << " Transport:" << transport_type();
|
| + << " Type:" << content_type();
|
| }
|
|
|
| // static
|
|
|