Reland of Make the new jitter buffer the default jitter buffer.

webrtc/video/rtp_stream_receiver_unittest.cc

Index: webrtc/video/rtp_stream_receiver_unittest.cc
diff --git a/webrtc/video/rtp_stream_receiver_unittest.cc b/webrtc/video/rtp_stream_receiver_unittest.cc
index 6573132466ad0bac4793c6b8c0436dcd210ba572..c61f45c438b27a1da923435f98c4ff60c1576f07 100644
--- a/webrtc/video/rtp_stream_receiver_unittest.cc
+++ b/webrtc/video/rtp_stream_receiver_unittest.cc
@@ -104,7 +104,7 @@ class RtpStreamReceiverTest : public testing::Test {
 
   void SetUp() {
     rtp_stream_receiver_.reset(new RtpStreamReceiver(
-        nullptr, nullptr, &mock_transport_, nullptr, &packet_router_,
+        nullptr, &mock_transport_, nullptr, &packet_router_,
         nullptr, &config_, nullptr, process_thread_.get(),
         &mock_nack_sender_, &mock_key_frame_request_sender_,
         &mock_on_complete_frame_callback_, &timing_));