Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h
diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h
index 871c1832fc4199e1868a0eff103588d1a97ee3e9..367fb8951a1f9168b78a62f22fca7105ddca50c3 100644
--- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h
+++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h
@@ -22,8 +22,8 @@ class MockVideoRenderer : public cricket::VideoRenderer {
public:
MockVideoRenderer();
virtual ~MockVideoRenderer();
- virtual bool SetSize(int width, int height, int reserved) OVERRIDE;
- virtual bool RenderFrame(const cricket::VideoFrame* frame) OVERRIDE;
+ virtual bool SetSize(int width, int height, int reserved) override;
+ virtual bool RenderFrame(const cricket::VideoFrame* frame) override;
int width() const { return width_; }
int height() const { return height_; }
@@ -39,14 +39,14 @@ class MockVideoSource : public webrtc::VideoSourceInterface {
public:
MockVideoSource();
- virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
- virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
- virtual MediaSourceInterface::SourceState state() const OVERRIDE;
- virtual cricket::VideoCapturer* GetVideoCapturer() OVERRIDE;
- virtual void AddSink(cricket::VideoRenderer* output) OVERRIDE;
- virtual void RemoveSink(cricket::VideoRenderer* output) OVERRIDE;
- virtual cricket::VideoRenderer* FrameInput() OVERRIDE;
- virtual const cricket::VideoOptions* options() const OVERRIDE;
+ virtual void RegisterObserver(webrtc::ObserverInterface* observer) override;
+ virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override;
+ virtual MediaSourceInterface::SourceState state() const override;
+ virtual cricket::VideoCapturer* GetVideoCapturer() override;
+ virtual void AddSink(cricket::VideoRenderer* output) override;
+ virtual void RemoveSink(cricket::VideoRenderer* output) override;
+ virtual cricket::VideoRenderer* FrameInput() override;
+ virtual const cricket::VideoOptions* options() const override;
// Changes the state of the source to live and notifies the observer.
void SetLive();
@@ -77,9 +77,9 @@ class MockAudioSource : public webrtc::AudioSourceInterface {
explicit MockAudioSource(
const webrtc::MediaConstraintsInterface* constraints);
- virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
- virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
- virtual MediaSourceInterface::SourceState state() const OVERRIDE;
+ virtual void RegisterObserver(webrtc::ObserverInterface* observer) override;
+ virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override;
+ virtual MediaSourceInterface::SourceState state() const override;
// Changes the state of the source to live and notifies the observer.
void SetLive();
@@ -109,18 +109,18 @@ class MockWebRtcVideoTrack : public webrtc::VideoTrackInterface {
public:
MockWebRtcVideoTrack(const std::string& id,
webrtc::VideoSourceInterface* source);
- virtual void AddRenderer(webrtc::VideoRendererInterface* renderer) OVERRIDE;
+ virtual void AddRenderer(webrtc::VideoRendererInterface* renderer) override;
virtual void RemoveRenderer(
- webrtc::VideoRendererInterface* renderer) OVERRIDE;
- virtual std::string kind() const OVERRIDE;
- virtual std::string id() const OVERRIDE;
- virtual bool enabled() const OVERRIDE;
- virtual TrackState state() const OVERRIDE;
- virtual bool set_enabled(bool enable) OVERRIDE;
- virtual bool set_state(TrackState new_state) OVERRIDE;
- virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
- virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
- virtual webrtc::VideoSourceInterface* GetSource() const OVERRIDE;
+ webrtc::VideoRendererInterface* renderer) override;
+ virtual std::string kind() const override;
+ virtual std::string id() const override;
+ virtual bool enabled() const override;
+ virtual TrackState state() const override;
+ virtual bool set_enabled(bool enable) override;
+ virtual bool set_state(TrackState new_state) override;
+ virtual void RegisterObserver(webrtc::ObserverInterface* observer) override;
+ virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override;
+ virtual webrtc::VideoSourceInterface* GetSource() const override;
protected:
virtual ~MockWebRtcVideoTrack();
@@ -138,19 +138,19 @@ class MockMediaStream : public webrtc::MediaStreamInterface {
public:
explicit MockMediaStream(const std::string& label);
- virtual bool AddTrack(webrtc::AudioTrackInterface* track) OVERRIDE;
- virtual bool AddTrack(webrtc::VideoTrackInterface* track) OVERRIDE;
- virtual bool RemoveTrack(webrtc::AudioTrackInterface* track) OVERRIDE;
- virtual bool RemoveTrack(webrtc::VideoTrackInterface* track) OVERRIDE;
- virtual std::string label() const OVERRIDE;
- virtual webrtc::AudioTrackVector GetAudioTracks() OVERRIDE;
- virtual webrtc::VideoTrackVector GetVideoTracks() OVERRIDE;
+ virtual bool AddTrack(webrtc::AudioTrackInterface* track) override;
+ virtual bool AddTrack(webrtc::VideoTrackInterface* track) override;
+ virtual bool RemoveTrack(webrtc::AudioTrackInterface* track) override;
+ virtual bool RemoveTrack(webrtc::VideoTrackInterface* track) override;
+ virtual std::string label() const override;
+ virtual webrtc::AudioTrackVector GetAudioTracks() override;
+ virtual webrtc::VideoTrackVector GetVideoTracks() override;
virtual rtc::scoped_refptr<webrtc::AudioTrackInterface>
- FindAudioTrack(const std::string& track_id) OVERRIDE;
+ FindAudioTrack(const std::string& track_id) override;
virtual rtc::scoped_refptr<webrtc::VideoTrackInterface>
- FindVideoTrack(const std::string& track_id) OVERRIDE;
- virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
- virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE;
+ FindVideoTrack(const std::string& track_id) override;
+ virtual void RegisterObserver(webrtc::ObserverInterface* observer) override;
+ virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override;
protected:
virtual ~MockMediaStream();
@@ -178,45 +178,45 @@ class MockPeerConnectionDependencyFactory
const webrtc::PeerConnectionInterface::RTCConfiguration& config,
const webrtc::MediaConstraintsInterface* constraints,
blink::WebFrame* frame,
- webrtc::PeerConnectionObserver* observer) OVERRIDE;
+ webrtc::PeerConnectionObserver* observer) override;
virtual scoped_refptr<webrtc::AudioSourceInterface>
CreateLocalAudioSource(
- const webrtc::MediaConstraintsInterface* constraints) OVERRIDE;
+ const webrtc::MediaConstraintsInterface* constraints) override;
virtual WebRtcVideoCapturerAdapter* CreateVideoCapturer(
- bool is_screen_capture) OVERRIDE;
+ bool is_screen_capture) override;
virtual scoped_refptr<webrtc::VideoSourceInterface>
CreateVideoSource(
cricket::VideoCapturer* capturer,
- const blink::WebMediaConstraints& constraints) OVERRIDE;
+ const blink::WebMediaConstraints& constraints) override;
virtual scoped_refptr<WebAudioCapturerSource> CreateWebAudioSource(
- blink::WebMediaStreamSource* source) OVERRIDE;
+ blink::WebMediaStreamSource* source) override;
virtual scoped_refptr<webrtc::MediaStreamInterface>
- CreateLocalMediaStream(const std::string& label) OVERRIDE;
+ CreateLocalMediaStream(const std::string& label) override;
virtual scoped_refptr<webrtc::VideoTrackInterface>
CreateLocalVideoTrack(const std::string& id,
- webrtc::VideoSourceInterface* source) OVERRIDE;
+ webrtc::VideoSourceInterface* source) override;
virtual scoped_refptr<webrtc::VideoTrackInterface>
CreateLocalVideoTrack(const std::string& id,
- cricket::VideoCapturer* capturer) OVERRIDE;
+ cricket::VideoCapturer* capturer) override;
virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(
const std::string& type,
const std::string& sdp,
- webrtc::SdpParseError* error) OVERRIDE;
+ webrtc::SdpParseError* error) override;
virtual webrtc::IceCandidateInterface* CreateIceCandidate(
const std::string& sdp_mid,
int sdp_mline_index,
- const std::string& sdp) OVERRIDE;
+ const std::string& sdp) override;
virtual scoped_refptr<WebRtcAudioCapturer> CreateAudioCapturer(
int render_view_id, const StreamDeviceInfo& device_info,
const blink::WebMediaConstraints& constraints,
- MediaStreamAudioSource* audio_source) OVERRIDE;
+ MediaStreamAudioSource* audio_source) override;
void FailToCreateNextAudioCapturer() {
fail_to_create_next_audio_capturer_ = true;
}
virtual void StartLocalAudioTrack(
- WebRtcLocalAudioTrack* audio_track) OVERRIDE;
+ WebRtcLocalAudioTrack* audio_track) override;
MockAudioSource* last_audio_source() { return last_audio_source_.get(); }
MockVideoSource* last_video_source() { return last_video_source_.get(); }

Powered by Google App Engine
This is Rietveld 408576698