content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h - Issue 429113002: Webrtc deps roll.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 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

« no previous file with comments | « content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc ('k') | content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2bdda74d52a181486a8c6aa222d816f3343880f2..871c1832fc4199e1868a0eff103588d1a97ee3e9 100644

--- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h

+++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h

@@ -145,9 +145,9 @@ class MockMediaStream : public webrtc::MediaStreamInterface {

virtual std::string label() const OVERRIDE;

virtual webrtc::AudioTrackVector GetAudioTracks() OVERRIDE;

virtual webrtc::VideoTrackVector GetVideoTracks() OVERRIDE;

- virtual talk_base::scoped_refptr<webrtc::AudioTrackInterface>

+ virtual rtc::scoped_refptr<webrtc::AudioTrackInterface>

FindAudioTrack(const std::string& track_id) OVERRIDE;

- virtual talk_base::scoped_refptr<webrtc::VideoTrackInterface>

+ 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;