content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc - Issue 12084088: Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

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/mock_web_rtc_peer_connection_handler_client.cc

Issue 12084088: Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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/mock_web_rtc_peer_connection_handler_client.h ('k') | content/renderer/media/peer_connection_handler_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc

diff --git a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc

index 91cd2455f3009cd73831bf326b803b20b5531674..fced7c2edde09fb76587c20fdd9f8dff21ecdaf9 100644

--- a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc

+++ b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc

@@ -5,7 +5,7 @@

#include "base/logging.h"

#include "base/utf_string_conversions.h"

-#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamDescriptor.h"

+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"

#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"

namespace content {

@@ -48,12 +48,12 @@ void MockWebRTCPeerConnectionHandlerClient::didChangeICEState(ICEState state) {

}

void MockWebRTCPeerConnectionHandlerClient::didAddRemoteStream(

- const WebKit::WebMediaStreamDescriptor& stream_descriptor) {

+ const WebKit::WebMediaStream& stream_descriptor) {

stream_label_ = UTF16ToUTF8(stream_descriptor.label());

}

void MockWebRTCPeerConnectionHandlerClient::didRemoveRemoteStream(

- const WebKit::WebMediaStreamDescriptor& stream_descriptor) {

+ const WebKit::WebMediaStream& stream_descriptor) {

DCHECK(stream_label_ == UTF16ToUTF8(stream_descriptor.label()));

stream_label_.clear();

}