Increasing "converge" time for remote candidate pair selection in test.

Increasing "converge" time for remote candidate pair selection in test.

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

Committed: https://crrev.com/7e1b8fbb453526525f4c02d9915f2ae3db23f3fa
Cr-Commit-Position: refs/heads/master@{#12934}

[Taylor Brandstetter, 2016-05-26 21:33:59]

Description was changed from

==========
Increasing "converge" time for remote candidate pair selection.

The local endpoint was given 4 seconds to converge but the remote
endpoint was only given 1 second.

Also fixed the ExpectCandidate2 method (used for verbose failure
logging) and removed a bunch of dead code.

Increasing timeout for some tests.
==========

to

==========
Increasing "converge" time for remote candidate pair selection.

The local endpoint was given 4 seconds to converge but the remote
endpoint was only given 1 second.

Also fixed the ExpectCandidate2 method (used for verbose failure
logging) and removed a bunch of dead code.
==========

[Taylor Brandstetter, 2016-05-26 21:34:40]

Description was changed from

==========
Increasing "converge" time for remote candidate pair selection.

The local endpoint was given 4 seconds to converge but the remote
endpoint was only given 1 second.

Also fixed the ExpectCandidate2 method (used for verbose failure
logging) and removed a bunch of dead code.
==========

to

==========
Increasing "converge" time for remote candidate pair selection.

The local endpoint was given 4 seconds to converge but the remote
endpoint was only given 1 second.

Also fixed the ExpectCandidate2 method (used for verbose failure
logging) and removed a bunch of dead code.

TBR=pthatcher@webrtc.org
==========

[Taylor Brandstetter, 2016-05-26 21:35:06]

Description was changed from

==========
Increasing "converge" time for remote candidate pair selection.

The local endpoint was given 4 seconds to converge but the remote
endpoint was only given 1 second.

Also fixed the ExpectCandidate2 method (used for verbose failure
logging) and removed a bunch of dead code.

TBR=pthatcher@webrtc.org
==========

to

==========
Increasing "converge" time for remote candidate pair selection in test.

The local endpoint was given 4 seconds to converge but the remote
endpoint was only given 1 second.

Also fixed the ExpectCandidate2 method (used for verbose failure
logging) and removed a bunch of dead code.

TBR=pthatcher@webrtc.org
==========

[Taylor Brandstetter, 2016-05-26 21:35:35]

Description was changed from

==========
Increasing "converge" time for remote candidate pair selection in test.

The local endpoint was given 4 seconds to converge but the remote
endpoint was only given 1 second.

Also fixed the ExpectCandidate2 method (used for verbose failure
logging) and removed a bunch of dead code.

TBR=pthatcher@webrtc.org
==========

to

==========
Increasing "converge" time for remote candidate pair selection in test.

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
==========

[Taylor Brandstetter, 2016-05-26 22:14:28]

deadbeef@webrtc.org changed reviewers:
+ pthatcher@webrtc.org

[Taylor Brandstetter, 2016-05-26 22:21:59]

Description was changed from

==========
Increasing "converge" time for remote candidate pair selection in test.

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
==========

to

==========
Increasing "converge" time for remote candidate pair selection in test.

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

Committed:
https://chromium.googlesource.com/external/webrtc/+/7e1b8fbb453526525f4c02d99...
==========

[Taylor Brandstetter, 2016-05-26 22:22:01]

Committed patchset #2 (id:20001) manually as
7e1b8fbb453526525f4c02d9915f2ae3db23f3fa (presubmit successful).

[commit-bot: I haz the power, 2016-05-26 22:22:03]

Description was changed from

==========
Increasing "converge" time for remote candidate pair selection in test.

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

Committed:
https://chromium.googlesource.com/external/webrtc/+/7e1b8fbb453526525f4c02d99...
==========

to

==========
Increasing "converge" time for remote candidate pair selection in test.

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

Committed: https://crrev.com/7e1b8fbb453526525f4c02d9915f2ae3db23f3fa
Cr-Commit-Position: refs/heads/master@{#12934}
==========