Rename BEGIN_PROXY_MAP --> BEGIN_SIGNALLING_PROXY_MAP.

webrtc/api/peerconnection.cc

Index: webrtc/api/peerconnection.cc
diff --git a/webrtc/api/peerconnection.cc b/webrtc/api/peerconnection.cc
index b2b8062ca843a00015851e2f9a735d53e13fee0f..a73570d97544ebd319aa94efa41e34715f2ecb44 100644
--- a/webrtc/api/peerconnection.cc
+++ b/webrtc/api/peerconnection.cc
@@ -688,7 +688,7 @@ rtc::scoped_refptr<RtpSenderInterface> PeerConnection::AddTrack(
   // TODO(deadbeef): Support adding a track to multiple streams.
   rtc::scoped_refptr<RtpSenderInterface> new_sender;
   if (track->kind() == MediaStreamTrackInterface::kAudioKind) {
-    new_sender = RtpSenderProxy::Create(
+    new_sender = RtpSenderSignallingProxy::Create(

[tommi, 2016/04/08 09:00:22]

ah, I didn't think through my class-renaming suggestion.  Maybe that change
isn't worth it.

         signaling_thread(),
         new AudioRtpSender(static_cast<AudioTrackInterface*>(track),
                            session_.get(), stats_.get()));
@@ -701,7 +701,7 @@ rtc::scoped_refptr<RtpSenderInterface> PeerConnection::AddTrack(
       new_sender->SetSsrc(track_info->ssrc);
     }
   } else if (track->kind() == MediaStreamTrackInterface::kVideoKind) {
-    new_sender = RtpSenderProxy::Create(
+    new_sender = RtpSenderSignallingProxy::Create(
         signaling_thread(),
         new VideoRtpSender(static_cast<VideoTrackInterface*>(track),
                            session_.get()));
@@ -759,7 +759,7 @@ rtc::scoped_refptr<DtmfSenderInterface> PeerConnection::CreateDtmfSender(
     LOG(LS_ERROR) << "CreateDtmfSender failed on DtmfSender::Create.";
     return NULL;
   }
-  return DtmfSenderProxy::Create(signaling_thread(), sender.get());
+  return DtmfSenderSignallingProxy::Create(signaling_thread(), sender.get());
 }
 
 rtc::scoped_refptr<RtpSenderInterface> PeerConnection::CreateSender(
@@ -768,11 +768,11 @@ rtc::scoped_refptr<RtpSenderInterface> PeerConnection::CreateSender(
   TRACE_EVENT0("webrtc", "PeerConnection::CreateSender");
   rtc::scoped_refptr<RtpSenderInterface> new_sender;
   if (kind == MediaStreamTrackInterface::kAudioKind) {
-    new_sender = RtpSenderProxy::Create(
+    new_sender = RtpSenderSignallingProxy::Create(
         signaling_thread(), new AudioRtpSender(session_.get(), stats_.get()));
   } else if (kind == MediaStreamTrackInterface::kVideoKind) {
-    new_sender = RtpSenderProxy::Create(signaling_thread(),
-                                        new VideoRtpSender(session_.get()));
+    new_sender = RtpSenderSignallingProxy::Create(
+        signaling_thread(), new VideoRtpSender(session_.get()));
   } else {
     LOG(LS_ERROR) << "CreateSender called with invalid kind: " << kind;
     return new_sender;
@@ -851,7 +851,7 @@ PeerConnection::CreateDataChannel(
     observer_->OnRenegotiationNeeded();
   }
 
-  return DataChannelProxy::Create(signaling_thread(), channel.get());
+  return DataChannelSignallingProxy::Create(signaling_thread(), channel.get());
 }
 
 void PeerConnection::CreateOffer(CreateSessionDescriptionObserver* observer,
@@ -1282,7 +1282,7 @@ void PeerConnection::OnMessage(rtc::Message* msg) {
 void PeerConnection::CreateAudioReceiver(MediaStreamInterface* stream,
                                          const std::string& track_id,
                                          uint32_t ssrc) {
-  receivers_.push_back(RtpReceiverProxy::Create(
+  receivers_.push_back(RtpReceiverSignallingProxy::Create(
       signaling_thread(),
       new AudioRtpReceiver(stream, track_id, ssrc, session_.get())));
 }
@@ -1290,7 +1290,7 @@ void PeerConnection::CreateAudioReceiver(MediaStreamInterface* stream,
 void PeerConnection::CreateVideoReceiver(MediaStreamInterface* stream,
                                          const std::string& track_id,
                                          uint32_t ssrc) {
-  receivers_.push_back(RtpReceiverProxy::Create(
+  receivers_.push_back(RtpReceiverSignallingProxy::Create(
       signaling_thread(),
       new VideoRtpReceiver(stream, track_id, factory_->worker_thread(), ssrc,
                            session_.get())));
@@ -1385,9 +1385,10 @@ void PeerConnection::OnAudioTrackAdded(AudioTrackInterface* track,
   }
 
   // Normal case; we've never seen this track before.
-  rtc::scoped_refptr<RtpSenderInterface> new_sender = RtpSenderProxy::Create(
-      signaling_thread(),
-      new AudioRtpSender(track, stream->label(), session_.get(), stats_.get()));
+  rtc::scoped_refptr<RtpSenderInterface> new_sender =
+      RtpSenderSignallingProxy::Create(
+          signaling_thread(), new AudioRtpSender(track, stream->label(),
+                                                 session_.get(), stats_.get()));
   senders_.push_back(new_sender);
   // If the sender has already been configured in SDP, we call SetSsrc,
   // which will connect the sender to the underlying transport. This can
@@ -1427,9 +1428,10 @@ void PeerConnection::OnVideoTrackAdded(VideoTrackInterface* track,
   }
 
   // Normal case; we've never seen this track before.
-  rtc::scoped_refptr<RtpSenderInterface> new_sender = RtpSenderProxy::Create(
-      signaling_thread(),
-      new VideoRtpSender(track, stream->label(), session_.get()));
+  rtc::scoped_refptr<RtpSenderInterface> new_sender =
+      RtpSenderSignallingProxy::Create(
+          signaling_thread(),
+          new VideoRtpSender(track, stream->label(), session_.get()));
   senders_.push_back(new_sender);
   const TrackInfo* track_info =
       FindTrackInfo(local_video_tracks_, stream->label(), track->id());
@@ -1599,8 +1601,8 @@ void PeerConnection::UpdateRemoteStreamsList(
         remote_streams_->find(stream_label);
     if (!stream) {
       // This is a new MediaStream. Create a new remote MediaStream.
-      stream = MediaStreamProxy::Create(rtc::Thread::Current(),
-                                        MediaStream::Create(stream_label));
+      stream = MediaStreamSignallingProxy::Create(
+          rtc::Thread::Current(), MediaStream::Create(stream_label));
       remote_streams_->AddStream(stream);
       new_streams->AddStream(stream);
     }
@@ -1619,7 +1621,7 @@ void PeerConnection::UpdateRemoteStreamsList(
         remote_streams_->find(kDefaultStreamLabel);
     if (!default_stream) {
       // Create the new default MediaStream.
-      default_stream = MediaStreamProxy::Create(
+      default_stream = MediaStreamSignallingProxy::Create(
           rtc::Thread::Current(), MediaStream::Create(kDefaultStreamLabel));
       remote_streams_->AddStream(default_stream);
       new_streams->AddStream(default_stream);
@@ -1865,7 +1867,7 @@ void PeerConnection::CreateRemoteRtpDataChannel(const std::string& label,
   }
   channel->SetReceiveSsrc(remote_ssrc);
   observer_->OnDataChannel(
-      DataChannelProxy::Create(signaling_thread(), channel));
+      DataChannelSignallingProxy::Create(signaling_thread(), channel));
 }
 
 rtc::scoped_refptr<DataChannel> PeerConnection::InternalCreateDataChannel(
@@ -1996,7 +1998,7 @@ void PeerConnection::OnDataChannelOpenMessage(
   }
 
   observer_->OnDataChannel(
-      DataChannelProxy::Create(signaling_thread(), channel));
+      DataChannelSignallingProxy::Create(signaling_thread(), channel));
 }
 
 RtpSenderInterface* PeerConnection::FindSenderById(const std::string& id) {