From 528b7931f8412d1d250efa4619a1177d5bd66fa3 Mon Sep 17 00:00:00 2001
From: nisse <nisse@webrtc.org>
Date: Mon, 8 May 2017 03:21:43 -0700
Subject: [PATCH] Update comments for removal of MediaController.

Comment-only changes.

TBR=deadbeef@webrtc.org
BUG=webrtc:7135

Review-Url: https://codereview.webrtc.org/2869703002
Cr-Commit-Position: refs/heads/master@{#18045}
---
 webrtc/media/base/mediachannel.h              |  3 +--
 webrtc/ortc/rtptransportcontrolleradapter.h   |  2 +-
 webrtc/pc/peerconnectioninterface_unittest.cc | 16 ++++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
index 6f14b7aa2e..dadb55bfdb 100644
--- a/webrtc/media/base/mediachannel.h
+++ b/webrtc/media/base/mediachannel.h
@@ -92,8 +92,7 @@ static T MinPositive(T a, T b) {
   return std::min(a, b);
 }
 
-// Construction-time settings, passed to
-// MediaControllerInterface::Create, and passed on when creating
+// Construction-time settings, passed on when creating
 // MediaChannels.
 struct MediaConfig {
   // Set DSCP value on packets. This flag comes from the
diff --git a/webrtc/ortc/rtptransportcontrolleradapter.h b/webrtc/ortc/rtptransportcontrolleradapter.h
index f0dca7af0c..8601dfdb07 100644
--- a/webrtc/ortc/rtptransportcontrolleradapter.h
+++ b/webrtc/ortc/rtptransportcontrolleradapter.h
@@ -34,7 +34,7 @@ class RtpTransportAdapter;
 class OrtcRtpSenderAdapter;
 class OrtcRtpReceiverAdapter;
 
-// Implementation of RtpTransportControllerInterface. Wraps a MediaController,
+// Implementation of RtpTransportControllerInterface. Wraps a Call,
 // a VoiceChannel and VideoChannel, and maintains a list of dependent RTP
 // transports.
 //
diff --git a/webrtc/pc/peerconnectioninterface_unittest.cc b/webrtc/pc/peerconnectioninterface_unittest.cc
index ae2c873a3f..8b8b49c722 100644
--- a/webrtc/pc/peerconnectioninterface_unittest.cc
+++ b/webrtc/pc/peerconnectioninterface_unittest.cc
@@ -634,10 +634,10 @@ class MockPeerConnectionObserver : public PeerConnectionObserver {
 
 }  // namespace
 
-// The PeerConnectionMediaConfig tests below verify that configuration
-// and constraints are propagated into the MediaConfig passed to
-// CreateMediaController. These settings are intended for MediaChannel
-// constructors, but that is not exercised by these unittest.
+// The PeerConnectionMediaConfig tests below verify that configuration and
+// constraints are propagated into the PeerConnection's MediaConfig. These
+// settings are intended for MediaChannel constructors, but that is not
+// exercised by these unittest.
 class PeerConnectionFactoryForTest : public webrtc::PeerConnectionFactory {
  public:
   PeerConnectionFactoryForTest()
@@ -3333,7 +3333,7 @@ TEST_F(PeerConnectionMediaConfigTest, TestDefaults) {
 }
 
 // This test verifies the DSCP constraint is recognized and passed to
-// the CreateMediaController call.
+// the PeerConnection.
 TEST_F(PeerConnectionMediaConfigTest, TestDscpConstraintTrue) {
   PeerConnectionInterface::RTCConfiguration config;
   FakeConstraints constraints;
@@ -3346,7 +3346,7 @@ TEST_F(PeerConnectionMediaConfigTest, TestDscpConstraintTrue) {
 }
 
 // This test verifies the cpu overuse detection constraint is
-// recognized and passed to the CreateMediaController call.
+// recognized and passed to the PeerConnection.
 TEST_F(PeerConnectionMediaConfigTest, TestCpuOveruseConstraintFalse) {
   PeerConnectionInterface::RTCConfiguration config;
   FakeConstraints constraints;
@@ -3360,7 +3360,7 @@ TEST_F(PeerConnectionMediaConfigTest, TestCpuOveruseConstraintFalse) {
 }
 
 // This test verifies that the disable_prerenderer_smoothing flag is
-// propagated from RTCConfiguration to the CreateMediaController call.
+// propagated from RTCConfiguration to the PeerConnection.
 TEST_F(PeerConnectionMediaConfigTest, TestDisablePrerendererSmoothingTrue) {
   PeerConnectionInterface::RTCConfiguration config;
   FakeConstraints constraints;
@@ -3373,7 +3373,7 @@ TEST_F(PeerConnectionMediaConfigTest, TestDisablePrerendererSmoothingTrue) {
 }
 
 // This test verifies the suspend below min bitrate constraint is
-// recognized and passed to the CreateMediaController call.
+// recognized and passed to the PeerConnection.
 TEST_F(PeerConnectionMediaConfigTest,
        TestSuspendBelowMinBitrateConstraintTrue) {
   PeerConnectionInterface::RTCConfiguration config;