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 18 matching lines...) Expand all Loading... |
29 } | 29 } |
30 | 30 |
31 using webrtc::DataChannelInterface; | 31 using webrtc::DataChannelInterface; |
32 using webrtc::FakeConstraints; | 32 using webrtc::FakeConstraints; |
33 using webrtc::MediaConstraintsInterface; | 33 using webrtc::MediaConstraintsInterface; |
34 using webrtc::MediaStreamInterface; | 34 using webrtc::MediaStreamInterface; |
35 using webrtc::PeerConnectionInterface; | 35 using webrtc::PeerConnectionInterface; |
36 | 36 |
37 namespace { | 37 namespace { |
38 | 38 |
39 const size_t kMaxWait = 10000; | 39 const int kMaxWait = 10000; |
40 | 40 |
41 } // namespace | 41 } // namespace |
42 | 42 |
43 class PeerConnectionEndToEndTest | 43 class PeerConnectionEndToEndTest |
44 : public sigslot::has_slots<>, | 44 : public sigslot::has_slots<>, |
45 public testing::Test { | 45 public testing::Test { |
46 public: | 46 public: |
47 typedef std::vector<rtc::scoped_refptr<DataChannelInterface> > | 47 typedef std::vector<rtc::scoped_refptr<DataChannelInterface> > |
48 DataChannelList; | 48 DataChannelList; |
49 | 49 |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 0); | 364 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 0); |
365 // This removes the reference to the remote data channel that we hold. | 365 // This removes the reference to the remote data channel that we hold. |
366 callee_signaled_data_channels_.clear(); | 366 callee_signaled_data_channels_.clear(); |
367 caller_dc->Close(); | 367 caller_dc->Close(); |
368 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait); | 368 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait); |
369 | 369 |
370 // Wait for a bit longer so the remote data channel will receive the | 370 // Wait for a bit longer so the remote data channel will receive the |
371 // close message and be destroyed. | 371 // close message and be destroyed. |
372 rtc::Thread::Current()->ProcessMessages(100); | 372 rtc::Thread::Current()->ProcessMessages(100); |
373 } | 373 } |
OLD | NEW |