Revert of Implement the NackModule as part of the new jitter buffer.

webrtc/modules/video_coding/include/video_coding_defines.h

Index: webrtc/modules/video_coding/include/video_coding_defines.h
diff --git a/webrtc/modules/video_coding/include/video_coding_defines.h b/webrtc/modules/video_coding/include/video_coding_defines.h
index 4fe8c797933b8763f98bfc6b8f4f47678493fbe8..7d084c815b8f2ea2a92215bfc0a4394210783688 100644
--- a/webrtc/modules/video_coding/include/video_coding_defines.h
+++ b/webrtc/modules/video_coding/include/video_coding_defines.h
@@ -10,8 +10,6 @@
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_
 #define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_
-
-#include <vector>
 
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/typedefs.h"
@@ -162,8 +160,6 @@
 // Callback class used for telling the user about which packet sequence numbers
 // are currently
 // missing and need to be resent.
-// TODO(philipel): Deprecate VCMPacketRequestCallback
-//                 and use NackSender instead.
 class VCMPacketRequestCallback {
  public:
   virtual int32_t ResendPackets(const uint16_t* sequenceNumbers,
@@ -171,22 +167,6 @@
 
  protected:
   virtual ~VCMPacketRequestCallback() {}
-};
-
-class NackSender {
- public:
-  virtual void SendNack(const std::vector<uint16_t>& sequence_numbers) = 0;
-
- protected:
-  virtual ~NackSender() {}
-};
-
-class KeyFrameRequestSender {
- public:
-  virtual void RequestKeyFrame() = 0;
-
- protected:
-  virtual ~KeyFrameRequestSender() {}
 };
 
 // Callback used to inform the user of the the desired resolution