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

Unified Diff: content/renderer/media/peer_connection_tracker.cc

Issue 1259673002: Make UTF16ToASCII and UTF16TOUTF8 take a StringPiece (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/peer_connection_tracker.cc
diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc
index 691e3fee4739cbf3b52ee8c537b37088cb1be9a7..753706b0dffdf65d2de9755d0ab646521c888382 100644
--- a/content/renderer/media/peer_connection_tracker.cc
+++ b/content/renderer/media/peer_connection_tracker.cc
@@ -93,13 +93,13 @@ static string SerializeMediaConstraints(
static string SerializeMediaStreamComponent(
const blink::WebMediaStreamTrack component) {
- string id = base::UTF16ToUTF8(component.source().id());
+ string id = base::UTF16ToUTF8(base::StringPiece16(component.source().id()));
return id;
}
static string SerializeMediaDescriptor(
const blink::WebMediaStream& stream) {
- string label = base::UTF16ToUTF8(stream.id());
+ string label = base::UTF16ToUTF8(base::StringPiece16(stream.id()));
string result = "label: " + label;
blink::WebVector<blink::WebMediaStreamTrack> tracks;
stream.audioTracks(tracks);
@@ -494,9 +494,11 @@ void PeerConnectionTracker::TrackAddIceCandidate(
bool succeeded) {
DCHECK(main_thread_.CalledOnValidThread());
string value =
- "sdpMid: " + base::UTF16ToUTF8(candidate.sdpMid()) + ", " +
- "sdpMLineIndex: " + base::IntToString(candidate.sdpMLineIndex()) + ", " +
- "candidate: " + base::UTF16ToUTF8(candidate.candidate());
+ "sdpMid: " +
+ base::UTF16ToUTF8(base::StringPiece16(candidate.sdpMid())) + ", " +
+ "sdpMLineIndex: " + base::IntToString(candidate.sdpMLineIndex()) +
+ ", " + "candidate: " +
+ base::UTF16ToUTF8(base::StringPiece16(candidate.candidate()));
// OnIceCandidate always succeeds as it's a callback from the browser.
DCHECK(source != SOURCE_LOCAL || succeeded);
@@ -611,7 +613,7 @@ void PeerConnectionTracker::TrackCreateDTMFSender(
const blink::WebMediaStreamTrack& track) {
DCHECK(main_thread_.CalledOnValidThread());
SendPeerConnectionUpdate(pc_handler, "createDTMFSender",
- base::UTF16ToUTF8(track.id()));
+ base::UTF16ToUTF8(base::StringPiece16(track.id())));
}
void PeerConnectionTracker::TrackGetUserMedia(

Powered by Google App Engine
This is Rietveld 408576698