s/WebRtcVideoChannel2/WebRtcVideoChannel and s/WebRtcVideoEngine2/WebRtcVideoEngine

webrtc/media/base/mediachannel.h

Index: webrtc/media/base/mediachannel.h
diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
index 40869594e58956c2d3edc34ad5303732b318800a..1206cccbea527c5af2b9aa5c186e1a3a5f1834fb 100644
--- a/webrtc/media/base/mediachannel.h
+++ b/webrtc/media/base/mediachannel.h
@@ -108,7 +108,7 @@ struct MediaConfig {
     // Enable WebRTC suspension of video. No video frames will be sent
     // when the bitrate is below the configured minimum bitrate. This
     // flag comes from the PeerConnection constraint
-    // 'googSuspendBelowMinBitrate', and WebRtcVideoChannel2 copies it
+    // 'googSuspendBelowMinBitrate', and WebRtcVideoChannel copies it
     // to VideoSendStream::Config::suspend_below_min_bitrate.
     bool suspend_below_min_bitrate = false;
 
@@ -122,7 +122,7 @@ struct MediaConfig {
     // This flag comes from PeerConnection's RtcConfiguration, but is
     // currently only set by the command line flag
     // 'disable-rtc-smoothness-algorithm'.
-    // WebRtcVideoChannel2::AddRecvStream copies it to the created
+    // WebRtcVideoChannel::AddRecvStream copies it to the created
     // WebRtcVideoReceiveStream, where it is returned by the
     // SmoothsRenderedFrames method. This method is used by the
     // VideoReceiveStream, where the value is passed on to the
@@ -343,12 +343,12 @@ struct VideoOptions {
   }
 
   // Enable denoising? This flag comes from the getUserMedia
-  // constraint 'googNoiseReduction', and WebRtcVideoEngine2 passes it
+  // constraint 'googNoiseReduction', and WebRtcVideoEngine passes it
   // on to the codec options. Disabled by default.
   rtc::Optional<bool> video_noise_reduction;
   // Force screencast to use a minimum bitrate. This flag comes from
   // the PeerConnection constraint 'googScreencastMinBitrate'. It is
-  // copied to the encoder config by WebRtcVideoChannel2.
+  // copied to the encoder config by WebRtcVideoChannel.
   rtc::Optional<int> screencast_min_bitrate_kbps;
   // Set by screencast sources. Implies selection of encoding settings
   // suitable for screencast. Most likely not the right way to do
@@ -1021,7 +1021,7 @@ struct VideoSendParameters : RtpSendParameters<VideoCodec> {
   // description's SDP line 'a=x-google-flag:conference', copied over
   // by VideoChannel::SetRemoteContent_w, and ultimately used by
   // conference mode screencast logic in
-  // WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoEncoderConfig.
+  // WebRtcVideoChannel::WebRtcVideoSendStream::CreateVideoEncoderConfig.
   // The special screencast behaviour is disabled by default.
   bool conference_mode = false;
 };