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

Unified Diff: webrtc/p2p/base/session.cc

Issue 1353713002: Remove GICE (again). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Undo .gclient Created 5 years, 3 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 | « webrtc/p2p/base/session.h ('k') | webrtc/p2p/base/transport.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/session.cc
diff --git a/webrtc/p2p/base/session.cc b/webrtc/p2p/base/session.cc
index 5be8fd9c35983225b4fe1c32a1a08a74ab65f4bb..23680b9be83b858ab7c8a19127e73e4510adfb6b 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),
ssl_max_version_(rtc::SSL_PROTOCOL_DTLS_10),
ice_tiebreaker_(rtc::CreateRandomId64()),
@@ -580,7 +575,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(),
certificate_);
@@ -780,8 +774,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
« no previous file with comments | « webrtc/p2p/base/session.h ('k') | webrtc/p2p/base/transport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698