| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright 2012 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 | 
| 11 #include <memory> | 11 #include <memory> | 
| 12 #include <utility> | 12 #include <utility> | 
| 13 #include <vector> | 13 #include <vector> | 
| 14 | 14 | 
| 15 #include "webrtc/api/fakemetricsobserver.h" | 15 #include "webrtc/api/fakemetricsobserver.h" | 
| 16 #include "webrtc/api/jsepicecandidate.h" | 16 #include "webrtc/api/jsepicecandidate.h" | 
| 17 #include "webrtc/api/jsepsessiondescription.h" | 17 #include "webrtc/api/jsepsessiondescription.h" | 
| 18 #include "webrtc/base/checks.h" |  | 
| 19 #include "webrtc/base/fakenetwork.h" |  | 
| 20 #include "webrtc/base/firewallsocketserver.h" |  | 
| 21 #include "webrtc/base/gunit.h" |  | 
| 22 #include "webrtc/base/logging.h" |  | 
| 23 #include "webrtc/base/network.h" |  | 
| 24 #include "webrtc/base/ssladapter.h" |  | 
| 25 #include "webrtc/base/sslidentity.h" |  | 
| 26 #include "webrtc/base/sslstreamadapter.h" |  | 
| 27 #include "webrtc/base/stringutils.h" |  | 
| 28 #include "webrtc/base/thread.h" |  | 
| 29 #include "webrtc/base/virtualsocketserver.h" |  | 
| 30 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" | 18 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" | 
| 31 #include "webrtc/media/base/fakemediaengine.h" | 19 #include "webrtc/media/base/fakemediaengine.h" | 
| 32 #include "webrtc/media/base/fakevideorenderer.h" | 20 #include "webrtc/media/base/fakevideorenderer.h" | 
| 33 #include "webrtc/media/base/mediachannel.h" | 21 #include "webrtc/media/base/mediachannel.h" | 
| 34 #include "webrtc/media/engine/fakewebrtccall.h" | 22 #include "webrtc/media/engine/fakewebrtccall.h" | 
| 35 #include "webrtc/media/sctp/sctptransportinternal.h" | 23 #include "webrtc/media/sctp/sctptransportinternal.h" | 
| 36 #include "webrtc/p2p/base/packettransportinternal.h" | 24 #include "webrtc/p2p/base/packettransportinternal.h" | 
| 37 #include "webrtc/p2p/base/stunserver.h" | 25 #include "webrtc/p2p/base/stunserver.h" | 
| 38 #include "webrtc/p2p/base/teststunserver.h" | 26 #include "webrtc/p2p/base/teststunserver.h" | 
| 39 #include "webrtc/p2p/base/testturnserver.h" | 27 #include "webrtc/p2p/base/testturnserver.h" | 
| 40 #include "webrtc/p2p/client/basicportallocator.h" | 28 #include "webrtc/p2p/client/basicportallocator.h" | 
| 41 #include "webrtc/pc/audiotrack.h" | 29 #include "webrtc/pc/audiotrack.h" | 
| 42 #include "webrtc/pc/channelmanager.h" | 30 #include "webrtc/pc/channelmanager.h" | 
| 43 #include "webrtc/pc/mediasession.h" | 31 #include "webrtc/pc/mediasession.h" | 
| 44 #include "webrtc/pc/peerconnection.h" | 32 #include "webrtc/pc/peerconnection.h" | 
| 45 #include "webrtc/pc/sctputils.h" | 33 #include "webrtc/pc/sctputils.h" | 
| 46 #include "webrtc/pc/test/fakertccertificategenerator.h" | 34 #include "webrtc/pc/test/fakertccertificategenerator.h" | 
| 47 #include "webrtc/pc/videotrack.h" | 35 #include "webrtc/pc/videotrack.h" | 
| 48 #include "webrtc/pc/webrtcsession.h" | 36 #include "webrtc/pc/webrtcsession.h" | 
| 49 #include "webrtc/pc/webrtcsessiondescriptionfactory.h" | 37 #include "webrtc/pc/webrtcsessiondescriptionfactory.h" | 
|  | 38 #include "webrtc/rtc_base/checks.h" | 
|  | 39 #include "webrtc/rtc_base/fakenetwork.h" | 
|  | 40 #include "webrtc/rtc_base/firewallsocketserver.h" | 
|  | 41 #include "webrtc/rtc_base/gunit.h" | 
|  | 42 #include "webrtc/rtc_base/logging.h" | 
|  | 43 #include "webrtc/rtc_base/network.h" | 
|  | 44 #include "webrtc/rtc_base/ssladapter.h" | 
|  | 45 #include "webrtc/rtc_base/sslidentity.h" | 
|  | 46 #include "webrtc/rtc_base/sslstreamadapter.h" | 
|  | 47 #include "webrtc/rtc_base/stringutils.h" | 
|  | 48 #include "webrtc/rtc_base/thread.h" | 
|  | 49 #include "webrtc/rtc_base/virtualsocketserver.h" | 
| 50 | 50 | 
| 51 using cricket::FakeVoiceMediaChannel; | 51 using cricket::FakeVoiceMediaChannel; | 
| 52 using cricket::TransportInfo; | 52 using cricket::TransportInfo; | 
| 53 using rtc::SocketAddress; | 53 using rtc::SocketAddress; | 
| 54 using rtc::Thread; | 54 using rtc::Thread; | 
| 55 using webrtc::CreateSessionDescription; | 55 using webrtc::CreateSessionDescription; | 
| 56 using webrtc::CreateSessionDescriptionObserver; | 56 using webrtc::CreateSessionDescriptionObserver; | 
| 57 using webrtc::CreateSessionDescriptionRequest; | 57 using webrtc::CreateSessionDescriptionRequest; | 
| 58 using webrtc::DataChannel; | 58 using webrtc::DataChannel; | 
| 59 using webrtc::FakeMetricsObserver; | 59 using webrtc::FakeMetricsObserver; | 
| (...skipping 4279 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4339 } | 4339 } | 
| 4340 | 4340 | 
| 4341 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled.  That test | 4341 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled.  That test | 
| 4342 // currently fails because upon disconnection and reconnection OnIceComplete is | 4342 // currently fails because upon disconnection and reconnection OnIceComplete is | 
| 4343 // called more than once without returning to IceGatheringGathering. | 4343 // called more than once without returning to IceGatheringGathering. | 
| 4344 | 4344 | 
| 4345 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4345 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 
| 4346                         WebRtcSessionTest, | 4346                         WebRtcSessionTest, | 
| 4347                         testing::Values(ALREADY_GENERATED, | 4347                         testing::Values(ALREADY_GENERATED, | 
| 4348                                         DTLS_IDENTITY_STORE)); | 4348                                         DTLS_IDENTITY_STORE)); | 
| OLD | NEW | 
|---|