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

Unified Diff: webrtc/p2p/base/fakesession.h

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/dtlstransportchannel_unittest.cc ('k') | webrtc/p2p/base/p2ptransport.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/fakesession.h
diff --git a/webrtc/p2p/base/fakesession.h b/webrtc/p2p/base/fakesession.h
index 2ef9dd018bd02e5c73362ceffa0bf6925175465b..bd3c08902508fafc1cf414db3fecbb2d141e48bf 100644
--- a/webrtc/p2p/base/fakesession.h
+++ b/webrtc/p2p/base/fakesession.h
@@ -53,7 +53,6 @@ class FakeTransportChannel : public TransportChannelImpl,
do_dtls_(false),
role_(ICEROLE_UNKNOWN),
tiebreaker_(0),
- ice_proto_(ICEPROTO_HYBRID),
remote_ice_mode_(ICEMODE_FULL),
dtls_fingerprint_("", nullptr, 0),
ssl_role_(rtc::SSL_CLIENT),
@@ -64,7 +63,6 @@ class FakeTransportChannel : public TransportChannelImpl,
}
uint64 IceTiebreaker() const { return tiebreaker_; }
- TransportProtocol protocol() const { return ice_proto_; }
IceMode remote_ice_mode() const { return remote_ice_mode_; }
const std::string& ice_ufrag() const { return ice_ufrag_; }
const std::string& ice_pwd() const { return ice_pwd_; }
@@ -104,11 +102,6 @@ class FakeTransportChannel : public TransportChannelImpl,
ice_ufrag_ = ice_ufrag;
ice_pwd_ = ice_pwd;
}
- bool GetIceProtocolType(IceProtocolType* type) const override {
- *type = ice_proto_;
- return true;
- }
- void SetIceProtocolType(IceProtocolType type) override { ice_proto_ = type; }
void SetRemoteIceCredentials(const std::string& ice_ufrag,
const std::string& ice_pwd) override {
remote_ice_ufrag_ = ice_ufrag;
@@ -319,7 +312,6 @@ class FakeTransportChannel : public TransportChannelImpl,
std::string chosen_srtp_cipher_;
IceRole role_;
uint64 tiebreaker_;
- IceProtocolType ice_proto_;
std::string ice_ufrag_;
std::string ice_pwd_;
std::string remote_ice_ufrag_;
@@ -341,7 +333,7 @@ class FakeTransport : public Transport {
const std::string& content_name,
PortAllocator* alllocator = nullptr)
: Transport(signaling_thread, worker_thread,
- content_name, "test_type", nullptr),
+ content_name, nullptr),
dest_(nullptr),
async_(false) {
}
« no previous file with comments | « webrtc/p2p/base/dtlstransportchannel_unittest.cc ('k') | webrtc/p2p/base/p2ptransport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698