WebString: makes string16 conversions explicit (part 1: blink, content)

content/renderer/media/peer_connection_tracker.cc

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 3e2dc702483711cdcbe025876c565dd167689214..96012104bf655d8444ed62d4787ebbf74d8278ae 100644
--- a/content/renderer/media/peer_connection_tracker.cc
+++ b/content/renderer/media/peer_connection_tracker.cc
@@ -85,12 +85,12 @@ static std::string SerializeAnswerOptions(
 
 static std::string SerializeMediaStreamComponent(
     const blink::WebMediaStreamTrack& component) {
-  return base::UTF16ToUTF8(base::StringPiece16(component.source().id()));
+  return component.source().id().utf8();
 }
 
 static std::string SerializeMediaDescriptor(
     const blink::WebMediaStream& stream) {
-  std::string label = base::UTF16ToUTF8(base::StringPiece16(stream.id()));
+  std::string label = stream.id().utf8();
   std::string result = "label: " + label;
   blink::WebVector<blink::WebMediaStreamTrack> tracks;
   stream.audioTracks(tracks);
@@ -554,11 +554,10 @@ void PeerConnectionTracker::TrackAddIceCandidate(
   int id = GetLocalIDForHandler(pc_handler);
   if (id == -1)
     return;
-  std::string value =
-      "sdpMid: " + base::UTF16ToUTF8(base::StringPiece16(candidate.sdpMid())) +
-      ", " + "sdpMLineIndex: " + base::UintToString(candidate.sdpMLineIndex()) +
-      ", " + "candidate: " +
-      base::UTF16ToUTF8(base::StringPiece16(candidate.candidate()));
+  std::string value = "sdpMid: " + candidate.sdpMid().utf8() + ", " +
+                      "sdpMLineIndex: " +
+                      base::UintToString(candidate.sdpMLineIndex()) + ", " +
+                      "candidate: " + candidate.candidate().utf8();
 
   // OnIceCandidate always succeeds as it's a callback from the browser.
   DCHECK(source != SOURCE_LOCAL || succeeded);
@@ -704,8 +703,7 @@ void PeerConnectionTracker::TrackCreateDTMFSender(
   int id = GetLocalIDForHandler(pc_handler);
   if (id == -1)
     return;
-  SendPeerConnectionUpdate(id, "createDTMFSender",
-                           base::UTF16ToUTF8(base::StringPiece16(track.id())));
+  SendPeerConnectionUpdate(id, "createDTMFSender", track.id().utf8());
 }
 
 void PeerConnectionTracker::TrackGetUserMedia(