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