df6075a77f
(This is a re-upload of https://codereview.webrtc.org/2567243003/, the CQ stopped working there.) The previously used WebRtcSession::GetTransportStats did a synchronous invoke per channel (voice, video, data) on the signaling thread to the network thread - e.g. 3 blocking invokes. It is replaced by WebRtcSession::GetStats[_s] which can be invoked on the signaling thread or on any thread if a ChannelNamePairs argument is present (provided by WebRtcSession::GetChannelNamePairs on the signaling thread). With these changes, and changes allowing the getting of certificates from any thread, the RTCStatsCollector can turn the 3 blocking thread invokes into 1 non-blocking invoke. BUG=webrtc:6875, chromium:627816 Review-Url: https://codereview.webrtc.org/2583883002 Cr-Commit-Position: refs/heads/master@{#15672}
64 lines
2.5 KiB
C++
64 lines
2.5 KiB
C++
/*
|
|
* Copyright 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_API_TEST_MOCK_WEBRTCSESSION_H_
|
|
#define WEBRTC_API_TEST_MOCK_WEBRTCSESSION_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "webrtc/api/webrtcsession.h"
|
|
#include "webrtc/test/gmock.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class MockWebRtcSession : public webrtc::WebRtcSession {
|
|
public:
|
|
// TODO(nisse): Valid overrides commented out, because the gmock
|
|
// methods don't use any override declarations, and we want to avoid
|
|
// warnings from -Winconsistent-missing-override. See
|
|
// http://crbug.com/428099.
|
|
explicit MockWebRtcSession(MediaControllerInterface* media_controller)
|
|
: WebRtcSession(
|
|
media_controller,
|
|
rtc::Thread::Current(),
|
|
rtc::Thread::Current(),
|
|
rtc::Thread::Current(),
|
|
nullptr,
|
|
std::unique_ptr<cricket::TransportController>(
|
|
new cricket::TransportController(rtc::Thread::Current(),
|
|
rtc::Thread::Current(),
|
|
nullptr))) {}
|
|
MOCK_METHOD0(voice_channel, cricket::VoiceChannel*());
|
|
MOCK_METHOD0(video_channel, cricket::VideoChannel*());
|
|
// Libjingle uses "local" for a outgoing track, and "remote" for a incoming
|
|
// track.
|
|
MOCK_METHOD2(GetLocalTrackIdBySsrc, bool(uint32_t, std::string*));
|
|
MOCK_METHOD2(GetRemoteTrackIdBySsrc, bool(uint32_t, std::string*));
|
|
MOCK_METHOD1(GetStats,
|
|
std::unique_ptr<SessionStats>(const ChannelNamePairs&));
|
|
MOCK_METHOD2(GetLocalCertificate,
|
|
bool(const std::string& transport_name,
|
|
rtc::scoped_refptr<rtc::RTCCertificate>* certificate));
|
|
|
|
// Workaround for gmock's inability to cope with move-only return values.
|
|
std::unique_ptr<rtc::SSLCertificate> GetRemoteSSLCertificate(
|
|
const std::string& transport_name) /* override */ {
|
|
return std::unique_ptr<rtc::SSLCertificate>(
|
|
GetRemoteSSLCertificate_ReturnsRawPointer(transport_name));
|
|
}
|
|
MOCK_METHOD1(GetRemoteSSLCertificate_ReturnsRawPointer,
|
|
rtc::SSLCertificate*(const std::string& transport_name));
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_API_TEST_MOCK_WEBRTCSESSION_H_
|