Remove VoERTP_RTCP

voice_engine/channel_proxy.h

 /*
  *  Copyright (c) 2015 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.
  */
 
 #ifndef VOICE_ENGINE_CHANNEL_PROXY_H_
 #define VOICE_ENGINE_CHANNEL_PROXY_H_
 
 #include "api/audio/audio_mixer.h"
 #include "api/audio_codecs/audio_encoder.h"
 #include "api/rtpreceiverinterface.h"
 #include "call/rtp_packet_sink_interface.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/thread_checker.h"
+#include "voice_engine/channel.h"
 #include "voice_engine/channel_manager.h"
-#include "voice_engine/include/voe_rtp_rtcp.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
 namespace webrtc {
 
 class AudioSinkInterface;
 class PacketRouter;
 class RtcEventLog;
 class RtcpBandwidthObserver;
 class RtcpRttStats;
 class RtpPacketSender;
 class RtpPacketReceived;
 class RtpReceiver;
 class RtpRtcp;
 class RtpTransportControllerSendInterface;
 class Transport;
 class TransportFeedbackObserver;
 
 namespace voe {
 
-class Channel;
-
 // This class provides the "view" of a voe::Channel that we need to implement
 // webrtc::AudioSendStream and webrtc::AudioReceiveStream. It serves two
 // purposes:
 //  1. Allow mocking just the interfaces used, instead of the entire
 //     voe::Channel class.
 //  2. Provide a refined interface for the stream classes, including assumptions
 //     on return values and input adaptation.
 class ChannelProxy : public RtpPacketSinkInterface {
  public:
   ChannelProxy();
@@ skipping 83 matching lines @@
   rtc::RaceChecker audio_thread_race_checker_;
   rtc::RaceChecker video_capture_thread_race_checker_;
   ChannelOwner channel_owner_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
 };
 }  // namespace voe
 }  // namespace webrtc
 
 #endif  // VOICE_ENGINE_CHANNEL_PROXY_H_