| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "talk/app/webrtc/streamcollection.h" | 38 #include "talk/app/webrtc/streamcollection.h" |
| 39 #include "talk/app/webrtc/test/fakeconstraints.h" | 39 #include "talk/app/webrtc/test/fakeconstraints.h" |
| 40 #include "talk/app/webrtc/test/fakedtlsidentitystore.h" | 40 #include "talk/app/webrtc/test/fakedtlsidentitystore.h" |
| 41 #include "talk/app/webrtc/videotrack.h" | 41 #include "talk/app/webrtc/videotrack.h" |
| 42 #include "talk/app/webrtc/webrtcsession.h" | 42 #include "talk/app/webrtc/webrtcsession.h" |
| 43 #include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" | 43 #include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" |
| 44 #include "talk/media/base/fakemediaengine.h" | 44 #include "talk/media/base/fakemediaengine.h" |
| 45 #include "talk/media/base/fakevideorenderer.h" | 45 #include "talk/media/base/fakevideorenderer.h" |
| 46 #include "talk/media/base/mediachannel.h" | 46 #include "talk/media/base/mediachannel.h" |
| 47 #include "talk/media/webrtc/fakewebrtccall.h" | 47 #include "talk/media/webrtc/fakewebrtccall.h" |
| 48 #include "webrtc/audio/audio_sink.h" |
| 48 #include "webrtc/p2p/base/stunserver.h" | 49 #include "webrtc/p2p/base/stunserver.h" |
| 49 #include "webrtc/p2p/base/teststunserver.h" | 50 #include "webrtc/p2p/base/teststunserver.h" |
| 50 #include "webrtc/p2p/base/testturnserver.h" | 51 #include "webrtc/p2p/base/testturnserver.h" |
| 51 #include "webrtc/p2p/base/transportchannel.h" | 52 #include "webrtc/p2p/base/transportchannel.h" |
| 52 #include "webrtc/p2p/client/basicportallocator.h" | 53 #include "webrtc/p2p/client/basicportallocator.h" |
| 53 #include "talk/session/media/channelmanager.h" | 54 #include "talk/session/media/channelmanager.h" |
| 54 #include "talk/session/media/mediasession.h" | 55 #include "talk/session/media/mediasession.h" |
| 55 #include "webrtc/base/fakenetwork.h" | 56 #include "webrtc/base/fakenetwork.h" |
| 56 #include "webrtc/base/firewallsocketserver.h" | 57 #include "webrtc/base/firewallsocketserver.h" |
| 57 #include "webrtc/base/gunit.h" | 58 #include "webrtc/base/gunit.h" |
| (...skipping 4142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4200 } | 4201 } |
| 4201 | 4202 |
| 4202 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4203 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
| 4203 // currently fails because upon disconnection and reconnection OnIceComplete is | 4204 // currently fails because upon disconnection and reconnection OnIceComplete is |
| 4204 // called more than once without returning to IceGatheringGathering. | 4205 // called more than once without returning to IceGatheringGathering. |
| 4205 | 4206 |
| 4206 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4207 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
| 4207 WebRtcSessionTest, | 4208 WebRtcSessionTest, |
| 4208 testing::Values(ALREADY_GENERATED, | 4209 testing::Values(ALREADY_GENERATED, |
| 4209 DTLS_IDENTITY_STORE)); | 4210 DTLS_IDENTITY_STORE)); |
| OLD | NEW |