| Index: content/renderer/media/peer_connection_tracker.cc
|
| diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc
|
| index 597c64557048f1c9872c53b9d189f740fd03bd23..b594ff8f0b3e76d52f789878f7c759b5038d0e12 100644
|
| --- a/content/renderer/media/peer_connection_tracker.cc
|
| +++ b/content/renderer/media/peer_connection_tracker.cc
|
| @@ -18,7 +18,7 @@
|
|
|
| using std::string;
|
| using webrtc::MediaConstraintsInterface;
|
| -using WebKit::WebRTCPeerConnectionHandlerClient;
|
| +using blink::WebRTCPeerConnectionHandlerClient;
|
|
|
| namespace content {
|
|
|
| @@ -63,16 +63,16 @@ static string SerializeMediaConstraints(
|
| }
|
|
|
| static string SerializeMediaStreamComponent(
|
| - const WebKit::WebMediaStreamTrack component) {
|
| + const blink::WebMediaStreamTrack component) {
|
| string id = UTF16ToUTF8(component.source().id());
|
| return id;
|
| }
|
|
|
| static string SerializeMediaDescriptor(
|
| - const WebKit::WebMediaStream& stream) {
|
| + const blink::WebMediaStream& stream) {
|
| string label = UTF16ToUTF8(stream.id());
|
| string result = "label: " + label;
|
| - WebKit::WebVector<WebKit::WebMediaStreamTrack> tracks;
|
| + blink::WebVector<blink::WebMediaStreamTrack> tracks;
|
| stream.audioTracks(tracks);
|
| if (!tracks.isEmpty()) {
|
| result += ", audio: [";
|
| @@ -251,7 +251,7 @@ void PeerConnectionTracker::RegisterPeerConnection(
|
| RTCPeerConnectionHandler* pc_handler,
|
| const std::vector<webrtc::PeerConnectionInterface::IceServer>& servers,
|
| const RTCMediaConstraints& constraints,
|
| - const WebKit::WebFrame* frame) {
|
| + const blink::WebFrame* frame) {
|
| DVLOG(1) << "PeerConnectionTracker::RegisterPeerConnection()";
|
| PeerConnectionInfo info;
|
|
|
| @@ -304,7 +304,7 @@ void PeerConnectionTracker::TrackCreateAnswer(
|
|
|
| void PeerConnectionTracker::TrackSetSessionDescription(
|
| RTCPeerConnectionHandler* pc_handler,
|
| - const WebKit::WebRTCSessionDescription& desc,
|
| + const blink::WebRTCSessionDescription& desc,
|
| Source source) {
|
| string sdp = UTF16ToUTF8(desc.sdp());
|
| string type = UTF16ToUTF8(desc.type());
|
| @@ -330,7 +330,7 @@ void PeerConnectionTracker::TrackUpdateIce(
|
|
|
| void PeerConnectionTracker::TrackAddIceCandidate(
|
| RTCPeerConnectionHandler* pc_handler,
|
| - const WebKit::WebRTCICECandidate& candidate,
|
| + const blink::WebRTCICECandidate& candidate,
|
| Source source) {
|
| string value = "mid: " + UTF16ToUTF8(candidate.sdpMid()) + ", " +
|
| "candidate: " + UTF16ToUTF8(candidate.candidate());
|
| @@ -341,7 +341,7 @@ void PeerConnectionTracker::TrackAddIceCandidate(
|
|
|
| void PeerConnectionTracker::TrackAddStream(
|
| RTCPeerConnectionHandler* pc_handler,
|
| - const WebKit::WebMediaStream& stream,
|
| + const blink::WebMediaStream& stream,
|
| Source source){
|
| SendPeerConnectionUpdate(
|
| pc_handler, source == SOURCE_LOCAL ? "addStream" : "onAddStream",
|
| @@ -350,7 +350,7 @@ void PeerConnectionTracker::TrackAddStream(
|
|
|
| void PeerConnectionTracker::TrackRemoveStream(
|
| RTCPeerConnectionHandler* pc_handler,
|
| - const WebKit::WebMediaStream& stream,
|
| + const blink::WebMediaStream& stream,
|
| Source source){
|
| SendPeerConnectionUpdate(
|
| pc_handler, source == SOURCE_LOCAL ? "removeStream" : "onRemoveStream",
|
| @@ -429,7 +429,7 @@ void PeerConnectionTracker::TrackOnRenegotiationNeeded(
|
|
|
| void PeerConnectionTracker::TrackCreateDTMFSender(
|
| RTCPeerConnectionHandler* pc_handler,
|
| - const WebKit::WebMediaStreamTrack& track) {
|
| + const blink::WebMediaStreamTrack& track) {
|
| SendPeerConnectionUpdate(pc_handler, "createDTMFSender",
|
| UTF16ToUTF8(track.id()));
|
| }
|
|
|