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

Side by Side Diff: content/renderer/media/mock_web_rtc_peer_connection_handler_client.cc

Issue 2584893002: Use explicit WebString <-> string16 conversion methods in media files (Closed)
Patch Set: . Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h" 4 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"
5 5
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "third_party/WebKit/public/platform/WebMediaStream.h" 8 #include "third_party/WebKit/public/platform/WebMediaStream.h"
9 #include "third_party/WebKit/public/platform/WebString.h" 9 #include "third_party/WebKit/public/platform/WebString.h"
10 10
(...skipping 14 matching lines...) Expand all
25 this, 25 this,
26 &MockWebRTCPeerConnectionHandlerClient::didRemoveRemoteStreamWorker)); 26 &MockWebRTCPeerConnectionHandlerClient::didRemoveRemoteStreamWorker));
27 } 27 }
28 28
29 MockWebRTCPeerConnectionHandlerClient:: 29 MockWebRTCPeerConnectionHandlerClient::
30 ~MockWebRTCPeerConnectionHandlerClient() {} 30 ~MockWebRTCPeerConnectionHandlerClient() {}
31 31
32 void MockWebRTCPeerConnectionHandlerClient::didGenerateICECandidateWorker( 32 void MockWebRTCPeerConnectionHandlerClient::didGenerateICECandidateWorker(
33 const blink::WebRTCICECandidate& candidate) { 33 const blink::WebRTCICECandidate& candidate) {
34 if (!candidate.isNull()) { 34 if (!candidate.isNull()) {
35 candidate_sdp_ = 35 candidate_sdp_ = candidate.candidate().utf8();
36 base::UTF16ToUTF8(base::StringPiece16(candidate.candidate()));
37 candidate_mline_index_ = candidate.sdpMLineIndex(); 36 candidate_mline_index_ = candidate.sdpMLineIndex();
38 candidate_mid_ = base::UTF16ToUTF8(base::StringPiece16(candidate.sdpMid())); 37 candidate_mid_ = candidate.sdpMid().utf8();
39 } else { 38 } else {
40 candidate_sdp_ = ""; 39 candidate_sdp_ = "";
41 candidate_mline_index_ = -1; 40 candidate_mline_index_ = -1;
42 candidate_mid_ = ""; 41 candidate_mid_ = "";
43 } 42 }
44 } 43 }
45 44
46 void MockWebRTCPeerConnectionHandlerClient::didAddRemoteStreamWorker( 45 void MockWebRTCPeerConnectionHandlerClient::didAddRemoteStreamWorker(
47 const blink::WebMediaStream& stream_descriptor) { 46 const blink::WebMediaStream& stream_descriptor) {
48 remote_steam_ = stream_descriptor; 47 remote_steam_ = stream_descriptor;
49 } 48 }
50 49
51 void MockWebRTCPeerConnectionHandlerClient::didRemoveRemoteStreamWorker( 50 void MockWebRTCPeerConnectionHandlerClient::didRemoveRemoteStreamWorker(
52 const blink::WebMediaStream& stream_descriptor) { 51 const blink::WebMediaStream& stream_descriptor) {
53 remote_steam_.reset(); 52 remote_steam_.reset();
54 } 53 }
55 54
56 } // namespace content 55 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698