| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright 2015 The WebRTC Project Authors. All rights reserved. | 2  *  Copyright 2015 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 <map> | 11 #include <map> | 
| 12 #include <memory> | 12 #include <memory> | 
| 13 | 13 | 
| 14 #include "webrtc/base/fakesslidentity.h" |  | 
| 15 #include "webrtc/base/gunit.h" |  | 
| 16 #include "webrtc/base/helpers.h" |  | 
| 17 #include "webrtc/base/sslidentity.h" |  | 
| 18 #include "webrtc/base/thread.h" |  | 
| 19 #include "webrtc/p2p/base/dtlstransportchannel.h" | 14 #include "webrtc/p2p/base/dtlstransportchannel.h" | 
| 20 #include "webrtc/p2p/base/fakeportallocator.h" | 15 #include "webrtc/p2p/base/fakeportallocator.h" | 
| 21 #include "webrtc/p2p/base/faketransportcontroller.h" | 16 #include "webrtc/p2p/base/faketransportcontroller.h" | 
| 22 #include "webrtc/p2p/base/p2ptransportchannel.h" | 17 #include "webrtc/p2p/base/p2ptransportchannel.h" | 
| 23 #include "webrtc/p2p/base/portallocator.h" | 18 #include "webrtc/p2p/base/portallocator.h" | 
| 24 #include "webrtc/p2p/base/transportcontroller.h" | 19 #include "webrtc/p2p/base/transportcontroller.h" | 
|  | 20 #include "webrtc/rtc_base/fakesslidentity.h" | 
|  | 21 #include "webrtc/rtc_base/gunit.h" | 
|  | 22 #include "webrtc/rtc_base/helpers.h" | 
|  | 23 #include "webrtc/rtc_base/sslidentity.h" | 
|  | 24 #include "webrtc/rtc_base/thread.h" | 
| 25 | 25 | 
| 26 static const int kTimeout = 100; | 26 static const int kTimeout = 100; | 
| 27 static const char kIceUfrag1[] = "TESTICEUFRAG0001"; | 27 static const char kIceUfrag1[] = "TESTICEUFRAG0001"; | 
| 28 static const char kIcePwd1[] = "TESTICEPWD00000000000001"; | 28 static const char kIcePwd1[] = "TESTICEPWD00000000000001"; | 
| 29 static const char kIceUfrag2[] = "TESTICEUFRAG0002"; | 29 static const char kIceUfrag2[] = "TESTICEUFRAG0002"; | 
| 30 static const char kIcePwd2[] = "TESTICEPWD00000000000002"; | 30 static const char kIcePwd2[] = "TESTICEPWD00000000000002"; | 
| 31 static const char kIceUfrag3[] = "TESTICEUFRAG0003"; | 31 static const char kIceUfrag3[] = "TESTICEUFRAG0003"; | 
| 32 static const char kIcePwd3[] = "TESTICEPWD00000000000003"; | 32 static const char kIcePwd3[] = "TESTICEPWD00000000000003"; | 
| 33 | 33 | 
| 34 namespace cricket { | 34 namespace cricket { | 
| (...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 900   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription( | 900   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription( | 
| 901       "audio", ice_restart_local_desc, CA_OFFER, nullptr)); | 901       "audio", ice_restart_local_desc, CA_OFFER, nullptr)); | 
| 902   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription( | 902   ASSERT_TRUE(transport_controller_->SetLocalTransportDescription( | 
| 903       "video", local_desc, CA_OFFER, nullptr)); | 903       "video", local_desc, CA_OFFER, nullptr)); | 
| 904   // NeedsIceRestart should still be true for video. | 904   // NeedsIceRestart should still be true for video. | 
| 905   EXPECT_FALSE(transport_controller_->NeedsIceRestart("audio")); | 905   EXPECT_FALSE(transport_controller_->NeedsIceRestart("audio")); | 
| 906   EXPECT_TRUE(transport_controller_->NeedsIceRestart("video")); | 906   EXPECT_TRUE(transport_controller_->NeedsIceRestart("video")); | 
| 907 } | 907 } | 
| 908 | 908 | 
| 909 }  // namespace cricket { | 909 }  // namespace cricket { | 
| OLD | NEW | 
|---|