Some cleanup in BaseChannel RTCP mux code.

webrtc/pc/rtcpmuxfilter.cc

 /*
  *  Copyright 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/pc/rtcpmuxfilter.h"
 
 #include "webrtc/base/logging.h"
 
 namespace cricket {
 
 RtcpMuxFilter::RtcpMuxFilter() : state_(ST_INIT), offer_enable_(false) {
 }
 
+bool RtcpMuxFilter::IsFullyActive() const {
+  return state_ == ST_ACTIVE;
+}
+
+bool RtcpMuxFilter::IsProvisionallyActive() const {
+  return state_ == ST_SENTPRANSWER || state_ == ST_RECEIVEDPRANSWER;
+}
+
 bool RtcpMuxFilter::IsActive() const {
-  return state_ == ST_SENTPRANSWER ||
-         state_ == ST_RECEIVEDPRANSWER ||
-         state_ == ST_ACTIVE;
+  return IsFullyActive() || IsProvisionallyActive();
 }
 
 void RtcpMuxFilter::SetActive() {
   state_ = ST_ACTIVE;
 }
 
 bool RtcpMuxFilter::SetOffer(bool offer_enable, ContentSource src) {
   if (state_ == ST_ACTIVE) {
     // Fail if we try to deactivate and no-op if we try and activate.
     return offer_enable;
@@ skipping 96 matching lines @@
 }
 
 bool RtcpMuxFilter::ExpectAnswer(ContentSource source) {
   return ((state_ == ST_SENTOFFER && source == CS_REMOTE) ||
           (state_ == ST_RECEIVEDOFFER && source == CS_LOCAL) ||
           (state_ == ST_SENTPRANSWER && source == CS_LOCAL) ||
           (state_ == ST_RECEIVEDPRANSWER && source == CS_REMOTE));
 }
 
 }  // namespace cricket