1. Override and virtual has to be consistent.
2. provide an implementation for SetIceConnectionReceivingTimeout so that Chrome does not complain.
BUG=
Review URL: https://codereview.webrtc.org/1227843006
Cr-Commit-Position: refs/heads/master@{#9574}
diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h
index 367bafe..ce32b50 100644
--- a/talk/app/webrtc/peerconnectioninterface.h
+++ b/talk/app/webrtc/peerconnectioninterface.h
@@ -336,7 +336,7 @@
virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer,
SessionDescriptionInterface* desc) = 0;
// Sets the ICE connection receiving timeout value in milliseconds.
- virtual void SetIceConnectionReceivingTimeout(int timeout_ms) = 0;
+ virtual void SetIceConnectionReceivingTimeout(int timeout_ms) {}
// Restarts or updates the ICE Agent process of gathering local candidates
// and pinging remote candidates.
virtual bool UpdateIce(const IceServers& configuration,
diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/webrtc/p2p/base/p2ptransportchannel.h
index b8ad5e2..926de95 100644
--- a/webrtc/p2p/base/p2ptransportchannel.h
+++ b/webrtc/p2p/base/p2ptransportchannel.h
@@ -73,6 +73,9 @@
virtual void Connect();
virtual void OnSignalingReady();
virtual void OnCandidate(const Candidate& candidate);
+ // Sets the receiving timeout in milliseconds.
+ // This also sets the check_receiving_delay proportionally.
+ virtual void SetReceivingTimeout(int receiving_timeout_ms);
// From TransportChannel:
virtual int SendPacket(const char *data, size_t len,
@@ -85,10 +88,6 @@
const Connection* best_connection() const { return best_connection_; }
void set_incoming_only(bool value) { incoming_only_ = value; }
- // Sets the receiving timeout in milliseconds.
- // This also sets the check_receiving_delay proportionally.
- void SetReceivingTimeout(int receiving_timeout_ms) override;
-
// Note: This is only for testing purpose.
// |ports_| should not be changed from outside.
const std::vector<PortInterface*>& ports() { return ports_; }