| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 } | 28 } |
| 29 | 29 |
| 30 using webrtc::DataChannelInterface; | 30 using webrtc::DataChannelInterface; |
| 31 using webrtc::FakeConstraints; | 31 using webrtc::FakeConstraints; |
| 32 using webrtc::MediaConstraintsInterface; | 32 using webrtc::MediaConstraintsInterface; |
| 33 using webrtc::MediaStreamInterface; | 33 using webrtc::MediaStreamInterface; |
| 34 using webrtc::PeerConnectionInterface; | 34 using webrtc::PeerConnectionInterface; |
| 35 | 35 |
| 36 namespace { | 36 namespace { |
| 37 | 37 |
| 38 const size_t kMaxWait = 10000; | 38 const int kMaxWait = 10000; |
| 39 | 39 |
| 40 } // namespace | 40 } // namespace |
| 41 | 41 |
| 42 class PeerConnectionEndToEndTest | 42 class PeerConnectionEndToEndTest |
| 43 : public sigslot::has_slots<>, | 43 : public sigslot::has_slots<>, |
| 44 public testing::Test { | 44 public testing::Test { |
| 45 public: | 45 public: |
| 46 typedef std::vector<rtc::scoped_refptr<DataChannelInterface> > | 46 typedef std::vector<rtc::scoped_refptr<DataChannelInterface> > |
| 47 DataChannelList; | 47 DataChannelList; |
| 48 | 48 |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 0); | 361 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 0); |
| 362 // This removes the reference to the remote data channel that we hold. | 362 // This removes the reference to the remote data channel that we hold. |
| 363 callee_signaled_data_channels_.clear(); | 363 callee_signaled_data_channels_.clear(); |
| 364 caller_dc->Close(); | 364 caller_dc->Close(); |
| 365 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait); | 365 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait); |
| 366 | 366 |
| 367 // Wait for a bit longer so the remote data channel will receive the | 367 // Wait for a bit longer so the remote data channel will receive the |
| 368 // close message and be destroyed. | 368 // close message and be destroyed. |
| 369 rtc::Thread::Current()->ProcessMessages(100); | 369 rtc::Thread::Current()->ProcessMessages(100); |
| 370 } | 370 } |
| OLD | NEW |