Revert of Clean away use of RtpAudioFeedback interface from RTP/RTCP receiver code.

webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 10 matching lines @@
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 class CriticalSectionWrapper;
 
 // Handles audio RTP packets. This class is thread-safe.
 class RTPReceiverAudio : public RTPReceiverStrategy,
                          public TelephoneEventHandler {
  public:
-  explicit RTPReceiverAudio(RtpData* data_callback);
+  RTPReceiverAudio(RtpData* data_callback,
+                   RtpAudioFeedback* incoming_messages_callback);
   virtual ~RTPReceiverAudio() {}
 
   // The following three methods implement the TelephoneEventHandler interface.
   // Forward DTMFs to decoder for playout.
   void SetTelephoneEventForwardToDecoder(bool forward_to_decoder);
 
   // Is forwarding of outband telephone events turned on/off?
   bool TelephoneEventForwardToDecoder() const;
 
   // Is TelephoneEvent configured with payload type payload_type
@@ skipping 69 matching lines @@
   int8_t cng_fb_payload_type_;
   int8_t cng_payload_type_;
 
   // G722 is special since it use the wrong number of RTP samples in timestamp
   // VS. number of samples in the frame
   int8_t g722_payload_type_;
   bool last_received_g722_;
 
   uint8_t num_energy_;
   uint8_t current_remote_energy_[kRtpCsrcSize];
+
+  RtpAudioFeedback* cb_audio_feedback_;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_