Use explicit WebString conversion methods in content/renderer/media (unittests)

content/renderer/media/rtc_peer_connection_handler_unittest.cc

Index: content/renderer/media/rtc_peer_connection_handler_unittest.cc
diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
index 41127627484e2910cd9bad0e835358ca9ed3c49c..8f1dbcd9c60e69f4d2e426331b8042f9fa66b086 100644
--- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc
+++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
@@ -335,8 +335,8 @@ class RTCPeerConnectionHandlerTest : public ::testing::Test {
         MediaStreamVideoSource::ConstraintsCallback(), true);
 
     blink::WebMediaStream local_stream;
-    local_stream.initialize(base::UTF8ToUTF16(stream_label), audio_tracks,
-                            video_tracks);
+    local_stream.initialize(blink::WebString::fromUTF8(stream_label),

[jrummell, 2017/01/19 20:17:03]

Most of the conversions of UTF8ToUTF16() became fromASCII(). This one is
different. Is that by design? (Also the 1 change in
mock_media_stream_registry.cc.)

[kinuko, 2017/01/20 02:22:35]

I wasn't sure if this method always takes ascii stream_label or not (while
others are just taking constants, so it was easy to guess).  Either should work
if it's ascii (fromASCII is slightly faster), while we need to use fromUTF8
otherwise.  (Since we're in the testing code we could also fallback to always
use fromUTF8 to simplify these, if you prefer)

+                            audio_tracks, video_tracks);
     local_stream.setExtraData(new MediaStream());
     return local_stream;
   }
@@ -1010,23 +1010,29 @@ TEST_F(RTCPeerConnectionHandlerTest, OnAddAndOnRemoveStream) {
       AddRemoteMockMediaStream(remote_stream_label, "video", "audio"));
 
   testing::InSequence sequence;
-  EXPECT_CALL(*mock_tracker_.get(), TrackAddStream(
-      pc_handler_.get(),
-      testing::Property(&blink::WebMediaStream::id,
-                        base::UTF8ToUTF16(remote_stream_label)),
-      PeerConnectionTracker::SOURCE_REMOTE));
-  EXPECT_CALL(*mock_client_.get(), didAddRemoteStream(
-      testing::Property(&blink::WebMediaStream::id,
-                        base::UTF8ToUTF16(remote_stream_label))));
-
-  EXPECT_CALL(*mock_tracker_.get(), TrackRemoveStream(
-      pc_handler_.get(),
-      testing::Property(&blink::WebMediaStream::id,
-                        base::UTF8ToUTF16(remote_stream_label)),
-      PeerConnectionTracker::SOURCE_REMOTE));
-  EXPECT_CALL(*mock_client_.get(), didRemoveRemoteStream(
-      testing::Property(&blink::WebMediaStream::id,
-                        base::UTF8ToUTF16(remote_stream_label))));
+  EXPECT_CALL(
+      *mock_tracker_.get(),
+      TrackAddStream(
+          pc_handler_.get(),
+          testing::Property(&blink::WebMediaStream::id,
+                            blink::WebString::fromASCII(remote_stream_label)),
+          PeerConnectionTracker::SOURCE_REMOTE));
+  EXPECT_CALL(*mock_client_.get(),
+              didAddRemoteStream(testing::Property(
+                  &blink::WebMediaStream::id,
+                  blink::WebString::fromASCII(remote_stream_label))));
+
+  EXPECT_CALL(
+      *mock_tracker_.get(),
+      TrackRemoveStream(
+          pc_handler_.get(),
+          testing::Property(&blink::WebMediaStream::id,
+                            blink::WebString::fromASCII(remote_stream_label)),
+          PeerConnectionTracker::SOURCE_REMOTE));
+  EXPECT_CALL(*mock_client_.get(),
+              didRemoveRemoteStream(testing::Property(
+                  &blink::WebMediaStream::id,
+                  blink::WebString::fromASCII(remote_stream_label))));
 
   pc_handler_->observer()->OnAddStream(remote_stream);
   base::RunLoop().RunUntilIdle();
@@ -1041,9 +1047,10 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoteTrackState) {
       AddRemoteMockMediaStream(remote_stream_label, "video", "audio"));
 
   testing::InSequence sequence;
-  EXPECT_CALL(*mock_client_.get(), didAddRemoteStream(
-      testing::Property(&blink::WebMediaStream::id,
-                        base::UTF8ToUTF16(remote_stream_label))));
+  EXPECT_CALL(*mock_client_.get(),
+              didAddRemoteStream(testing::Property(
+                  &blink::WebMediaStream::id,
+                  blink::WebString::fromASCII(remote_stream_label))));
   pc_handler_->observer()->OnAddStream(remote_stream);
   base::RunLoop().RunUntilIdle();
   const blink::WebMediaStream& webkit_stream = mock_client_->remote_stream();
@@ -1077,12 +1084,12 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddAudioTrackFromRemoteStream) {
 
   // Grab the added media stream when it's been successfully added to the PC.
   blink::WebMediaStream webkit_stream;
-  EXPECT_CALL(*mock_client_.get(), didAddRemoteStream(
-      testing::Property(&blink::WebMediaStream::id,
-                        base::UTF8ToUTF16(remote_stream_label))))
-      .WillOnce(
-          DoAll(SaveArg<0>(&webkit_stream),
-                ExitMessageLoop(&message_loop_, run_loop.QuitClosure())));
+  EXPECT_CALL(*mock_client_.get(),
+              didAddRemoteStream(testing::Property(
+                  &blink::WebMediaStream::id,
+                  blink::WebString::fromASCII(remote_stream_label))))
+      .WillOnce(DoAll(SaveArg<0>(&webkit_stream),
+                      ExitMessageLoop(&message_loop_, run_loop.QuitClosure())));
 
   rtc::scoped_refptr<webrtc::MediaStreamInterface> remote_stream(
       AddRemoteMockMediaStream(remote_stream_label, "video", "audio"));
@@ -1125,12 +1132,12 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddVideoTrackFromRemoteStream) {
 
   // Grab the added media stream when it's been successfully added to the PC.
   blink::WebMediaStream webkit_stream;
-  EXPECT_CALL(*mock_client_.get(), didAddRemoteStream(
-      testing::Property(&blink::WebMediaStream::id,
-                        base::UTF8ToUTF16(remote_stream_label))))
-      .WillOnce(
-          DoAll(SaveArg<0>(&webkit_stream),
-                ExitMessageLoop(&message_loop_, run_loop.QuitClosure())));
+  EXPECT_CALL(*mock_client_.get(),
+              didAddRemoteStream(testing::Property(
+                  &blink::WebMediaStream::id,
+                  blink::WebString::fromASCII(remote_stream_label))))
+      .WillOnce(DoAll(SaveArg<0>(&webkit_stream),
+                      ExitMessageLoop(&message_loop_, run_loop.QuitClosure())));
 
   rtc::scoped_refptr<webrtc::MediaStreamInterface> remote_stream(
       AddRemoteMockMediaStream(remote_stream_label, "video", "audio"));
@@ -1172,12 +1179,12 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddTracksFromRemoteStream) {
 
   // Grab the added media stream when it's been successfully added to the PC.
   blink::WebMediaStream webkit_stream;
-  EXPECT_CALL(*mock_client_.get(), didAddRemoteStream(
-      testing::Property(&blink::WebMediaStream::id,
-                        base::UTF8ToUTF16(remote_stream_label))))
-      .WillOnce(
-          DoAll(SaveArg<0>(&webkit_stream),
-                ExitMessageLoop(&message_loop_, run_loop.QuitClosure())));
+  EXPECT_CALL(*mock_client_.get(),
+              didAddRemoteStream(testing::Property(
+                  &blink::WebMediaStream::id,
+                  blink::WebString::fromASCII(remote_stream_label))))
+      .WillOnce(DoAll(SaveArg<0>(&webkit_stream),
+                      ExitMessageLoop(&message_loop_, run_loop.QuitClosure())));
 
   rtc::scoped_refptr<webrtc::MediaStreamInterface> remote_stream(
       AddRemoteMockMediaStream(remote_stream_label, "video", "audio"));