Merging BaseSession code into WebRtcSession.

talk/app/webrtc/peerconnection.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 768 matching lines @@
 }
 
 void PeerConnection::Close() {
   // Update stats here so that we have the most recent stats for tracks and
   // streams before the channels are closed.
   stats_->UpdateStats(kStatsOutputLevelStandard);
 
   session_->Terminate();
 }
 
-void PeerConnection::OnSessionStateChange(cricket::BaseSession* /*session*/,
-                                          cricket::BaseSession::State state) {
+void PeerConnection::OnSessionStateChange(WebRtcSession* /*session*/,
+                                          WebRtcSession::State state) {
   switch (state) {
-    case cricket::BaseSession::STATE_INIT:
+    case WebRtcSession::STATE_INIT:
       ChangeSignalingState(PeerConnectionInterface::kStable);
       break;
-    case cricket::BaseSession::STATE_SENTINITIATE:
+    case WebRtcSession::STATE_SENTOFFER:
       ChangeSignalingState(PeerConnectionInterface::kHaveLocalOffer);
       break;
-    case cricket::BaseSession::STATE_SENTPRACCEPT:
+    case WebRtcSession::STATE_SENTPRANSWER:
       ChangeSignalingState(PeerConnectionInterface::kHaveLocalPrAnswer);
       break;
-    case cricket::BaseSession::STATE_RECEIVEDINITIATE:
+    case WebRtcSession::STATE_RECEIVEDOFFER:
       ChangeSignalingState(PeerConnectionInterface::kHaveRemoteOffer);
       break;
-    case cricket::BaseSession::STATE_RECEIVEDPRACCEPT:
+    case WebRtcSession::STATE_RECEIVEDPRANSWER:
       ChangeSignalingState(PeerConnectionInterface::kHaveRemotePrAnswer);
       break;
-    case cricket::BaseSession::STATE_SENTACCEPT:
-    case cricket::BaseSession::STATE_RECEIVEDACCEPT:
+    case WebRtcSession::STATE_INPROGRESS:
       ChangeSignalingState(PeerConnectionInterface::kStable);
       break;
-    case cricket::BaseSession::STATE_RECEIVEDTERMINATE:
+    case WebRtcSession::STATE_TERMINATED:

[pthatcher1, 2015/10/10 00:07:26]

STATE_CLOSED?

[Taylor Brandstetter, 2015/10/10 00:30:15]

Done.

       ChangeSignalingState(PeerConnectionInterface::kClosed);
       break;
     default:
       break;
   }
 }
 
 void PeerConnection::OnMessage(rtc::Message* msg) {
   switch (msg->message_id) {
     case MSG_SET_SESSIONDESCRIPTION_SUCCESS: {
@@ skipping 188 matching lines @@
 std::vector<rtc::scoped_refptr<RtpReceiverInterface>>::iterator
 PeerConnection::FindReceiverForTrack(MediaStreamTrackInterface* track) {
   return std::find_if(
       receivers_.begin(), receivers_.end(),
       [track](const rtc::scoped_refptr<RtpReceiverInterface>& receiver) {
         return receiver->track() == track;
       });
 }
 
 }  // namespace webrtc