Index: webrtc/p2p/base/faketransportcontroller.h |
diff --git a/webrtc/p2p/base/faketransportcontroller.h b/webrtc/p2p/base/faketransportcontroller.h |
index 9598b822ce0dcf43dff855ebc95b4de475ddf661..7dacf26aa9260c0fa0fb05f882a18270a8976aad 100644 |
--- a/webrtc/p2p/base/faketransportcontroller.h |
+++ b/webrtc/p2p/base/faketransportcontroller.h |
@@ -16,7 +16,7 @@ |
#include <string> |
#include <vector> |
-#include "webrtc/p2p/base/candidatepairinterface.h" |
+#include "webrtc/p2p/base/candidatepair.h" |
#include "webrtc/p2p/base/transport.h" |
#include "webrtc/p2p/base/transportchannel.h" |
#include "webrtc/p2p/base/transportcontroller.h" |
@@ -483,24 +483,6 @@ class FakeQuicTransport : public QuicTransport { |
}; |
#endif |
-// Fake candidate pair class, which can be passed to BaseChannel for testing |
-// purposes. |
-class FakeCandidatePair : public CandidatePairInterface { |
- public: |
- FakeCandidatePair(const Candidate& local_candidate, |
- const Candidate& remote_candidate) |
- : local_candidate_(local_candidate), |
- remote_candidate_(remote_candidate) {} |
- const Candidate& local_candidate() const override { return local_candidate_; } |
- const Candidate& remote_candidate() const override { |
- return remote_candidate_; |
- } |
- |
- private: |
- Candidate local_candidate_; |
- Candidate remote_candidate_; |
-}; |
- |
// Fake TransportController class, which can be passed into a BaseChannel object |
// for test purposes. Can be connected to other FakeTransportControllers via |
// Connect(). |
@@ -560,16 +542,15 @@ class FakeTransportController : public TransportController { |
component); |
} |
- FakeCandidatePair* CreateFakeCandidatePair( |
- const rtc::SocketAddress& local_address, |
- int16_t local_network_id, |
- const rtc::SocketAddress& remote_address, |
- int16_t remote_network_id) { |
+ CandidatePair* CreateCandidatePair(const rtc::SocketAddress& local_address, |
+ int16_t local_network_id, |
+ const rtc::SocketAddress& remote_address, |
+ int16_t remote_network_id) { |
Candidate local_candidate(0, "udp", local_address, 0u, "", "", "local", 0, |
"foundation", local_network_id, 0); |
Candidate remote_candidate(0, "udp", remote_address, 0u, "", "", "local", 0, |
"foundation", remote_network_id, 0); |
- return new FakeCandidatePair(local_candidate, remote_candidate); |
+ return new CandidatePair(local_candidate, remote_candidate); |
} |
void set_fail_channel_creation(bool fail_channel_creation) { |