7e1b8fbb45
The local endpoint was given 4 seconds to converge but the remote endpoint was only given 1 second. Now they both collectively have 4 seconds. Also fixed the ExpectCandidate2 method (used for verbose failure logging) and removed a bunch of dead code. TBR=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/2018703002 . Cr-Commit-Position: refs/heads/master@{#12934}