| Index: webrtc/p2p/base/dtlstransportchannel_unittest.cc
|
| diff --git a/webrtc/p2p/base/dtlstransportchannel_unittest.cc b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
|
| index 95696e222c500f54cd44b23df3a218b52cf19ad2..e62563e9b56ce7a4a5c8747c4eddcbebacabcaeb 100644
|
| --- a/webrtc/p2p/base/dtlstransportchannel_unittest.cc
|
| +++ b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
|
| @@ -75,8 +75,6 @@ class DtlsTestClient : public sigslot::has_slots<> {
|
| transport_->SetIceRole(role);
|
| transport_->SetIceTiebreaker(
|
| (role == cricket::ICEROLE_CONTROLLING) ? 1 : 2);
|
| - transport_->SignalWritableState.connect(this,
|
| - &DtlsTestClient::OnTransportWritableState);
|
|
|
| for (int i = 0; i < count; ++i) {
|
| cricket::DtlsTransportChannelWrapper* channel =
|
| @@ -193,7 +191,15 @@ class DtlsTestClient : public sigslot::has_slots<> {
|
| }
|
|
|
| bool all_channels_writable() const {
|
| - return transport_->all_channels_writable();
|
| + if (channels_.empty()) {
|
| + return false;
|
| + }
|
| + for (cricket::DtlsTransportChannelWrapper* channel : channels_) {
|
| + if (!channel->writable()) {
|
| + return false;
|
| + }
|
| + }
|
| + return true;
|
| }
|
|
|
| void CheckRole(rtc::SSLRole role) {
|
| @@ -313,11 +319,6 @@ class DtlsTestClient : public sigslot::has_slots<> {
|
| return (num_matches < ((static_cast<int>(size) - 5) / 10));
|
| }
|
|
|
| - // Transport callbacks
|
| - void OnTransportWritableState(cricket::Transport* transport) {
|
| - LOG(LS_INFO) << name_ << ": is writable";
|
| - }
|
| -
|
| // Transport channel callbacks
|
| void OnTransportChannelWritableState(cricket::TransportChannel* channel) {
|
| LOG(LS_INFO) << name_ << ": Channel '" << channel->component()
|
|
|