| Index: content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc
|
| diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc
|
| index 7d7b49fbba44eacb441eada0c927ed76c387ab9a..c219537ae123e23659316f8277f8669a7622a38f 100644
|
| --- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc
|
| +++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc
|
| @@ -131,8 +131,7 @@ class MockRtcVideoCapturer : public WebRtcVideoCapturerAdapter {
|
| height_(0) {
|
| }
|
|
|
| - virtual void OnFrameCaptured(
|
| - const scoped_refptr<media::VideoFrame>& frame) override {
|
| + void OnFrameCaptured(const scoped_refptr<media::VideoFrame>& frame) override {
|
| ++number_of_capturered_frames_;
|
| width_ = frame->visible_rect().width();
|
| height_ = frame->visible_rect().height();
|
| @@ -352,41 +351,39 @@ class MockSessionDescription : public SessionDescriptionInterface {
|
| : type_(type),
|
| sdp_(sdp) {
|
| }
|
| - virtual ~MockSessionDescription() {}
|
| - virtual cricket::SessionDescription* description() override {
|
| + ~MockSessionDescription() override {}
|
| + cricket::SessionDescription* description() override {
|
| NOTIMPLEMENTED();
|
| return NULL;
|
| }
|
| - virtual const cricket::SessionDescription* description() const override {
|
| + const cricket::SessionDescription* description() const override {
|
| NOTIMPLEMENTED();
|
| return NULL;
|
| }
|
| - virtual std::string session_id() const override {
|
| + std::string session_id() const override {
|
| NOTIMPLEMENTED();
|
| return std::string();
|
| }
|
| - virtual std::string session_version() const override {
|
| + std::string session_version() const override {
|
| NOTIMPLEMENTED();
|
| return std::string();
|
| }
|
| - virtual std::string type() const override {
|
| - return type_;
|
| - }
|
| - virtual bool AddCandidate(const IceCandidateInterface* candidate) override {
|
| + std::string type() const override { return type_; }
|
| + bool AddCandidate(const IceCandidateInterface* candidate) override {
|
| NOTIMPLEMENTED();
|
| return false;
|
| }
|
| - virtual size_t number_of_mediasections() const override {
|
| + size_t number_of_mediasections() const override {
|
| NOTIMPLEMENTED();
|
| return 0;
|
| }
|
| - virtual const IceCandidateCollection* candidates(
|
| + const IceCandidateCollection* candidates(
|
| size_t mediasection_index) const override {
|
| NOTIMPLEMENTED();
|
| return NULL;
|
| }
|
|
|
| - virtual bool ToString(std::string* out) const override {
|
| + bool ToString(std::string* out) const override {
|
| *out = sdp_;
|
| return true;
|
| }
|
| @@ -407,17 +404,11 @@ class MockIceCandidate : public IceCandidateInterface {
|
| // Assign an valid address to |candidate_| to pass assert in code.
|
| candidate_.set_address(rtc::SocketAddress("127.0.0.1", 5000));
|
| }
|
| - virtual ~MockIceCandidate() {}
|
| - virtual std::string sdp_mid() const override {
|
| - return sdp_mid_;
|
| - }
|
| - virtual int sdp_mline_index() const override {
|
| - return sdp_mline_index_;
|
| - }
|
| - virtual const cricket::Candidate& candidate() const override {
|
| - return candidate_;
|
| - }
|
| - virtual bool ToString(std::string* out) const override {
|
| + ~MockIceCandidate() override {}
|
| + std::string sdp_mid() const override { return sdp_mid_; }
|
| + int sdp_mline_index() const override { return sdp_mline_index_; }
|
| + const cricket::Candidate& candidate() const override { return candidate_; }
|
| + bool ToString(std::string* out) const override {
|
| *out = sdp_;
|
| return true;
|
| }
|
|
|