| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 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 655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 rtc::scoped_ptr<cricket::FakeTransport> transport( | 666 rtc::scoped_ptr<cricket::FakeTransport> transport( |
| 667 new cricket::FakeTransport( | 667 new cricket::FakeTransport( |
| 668 session_.signaling_thread(), | 668 session_.signaling_thread(), |
| 669 session_.worker_thread(), | 669 session_.worker_thread(), |
| 670 transport_stats.content_name)); | 670 transport_stats.content_name)); |
| 671 transport->SetCertificate(local_certificate); | 671 transport->SetCertificate(local_certificate); |
| 672 cricket::FakeTransportChannel* channel = | 672 cricket::FakeTransportChannel* channel = |
| 673 static_cast<cricket::FakeTransportChannel*>( | 673 static_cast<cricket::FakeTransportChannel*>( |
| 674 transport->CreateChannel(channel_stats.component)); | 674 transport->CreateChannel(channel_stats.component)); |
| 675 EXPECT_FALSE(channel == NULL); | 675 EXPECT_FALSE(channel == NULL); |
| 676 channel->SetRemoteCertificate(remote_cert_copy.get()); | 676 channel->SetRemoteSSLCertificate(remote_cert_copy.get()); |
| 677 | 677 |
| 678 // Configure MockWebRtcSession | 678 // Configure MockWebRtcSession |
| 679 EXPECT_CALL(session_, GetTransport(transport_stats.content_name)) | 679 EXPECT_CALL(session_, GetTransport(transport_stats.content_name)) |
| 680 .WillRepeatedly(Return(transport.get())); | 680 .WillRepeatedly(Return(transport.get())); |
| 681 EXPECT_CALL(session_, GetTransportStats(_)) | 681 EXPECT_CALL(session_, GetTransportStats(_)) |
| 682 .WillOnce(DoAll(SetArgPointee<0>(session_stats), | 682 .WillOnce(DoAll(SetArgPointee<0>(session_stats), |
| 683 Return(true))); | 683 Return(true))); |
| 684 EXPECT_CALL(session_, video_channel()).WillRepeatedly(ReturnNull()); | 684 EXPECT_CALL(session_, video_channel()).WillRepeatedly(ReturnNull()); |
| 685 EXPECT_CALL(session_, voice_channel()).WillRepeatedly(ReturnNull()); | 685 EXPECT_CALL(session_, voice_channel()).WillRepeatedly(ReturnNull()); |
| 686 | 686 |
| (...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1704 cricket::VoiceSenderInfo new_voice_sender_info; | 1704 cricket::VoiceSenderInfo new_voice_sender_info; |
| 1705 InitVoiceSenderInfo(&new_voice_sender_info); | 1705 InitVoiceSenderInfo(&new_voice_sender_info); |
| 1706 cricket::VoiceMediaInfo new_stats_read; | 1706 cricket::VoiceMediaInfo new_stats_read; |
| 1707 reports.clear(); | 1707 reports.clear(); |
| 1708 SetupAndVerifyAudioTrackStats( | 1708 SetupAndVerifyAudioTrackStats( |
| 1709 new_audio_track.get(), stream_.get(), &stats, &voice_channel, kVcName, | 1709 new_audio_track.get(), stream_.get(), &stats, &voice_channel, kVcName, |
| 1710 media_channel, &new_voice_sender_info, NULL, &new_stats_read, &reports); | 1710 media_channel, &new_voice_sender_info, NULL, &new_stats_read, &reports); |
| 1711 } | 1711 } |
| 1712 | 1712 |
| 1713 } // namespace webrtc | 1713 } // namespace webrtc |
| OLD | NEW |