Reland: Implement NetEq's CurrentDelay function

webrtc/modules/audio_coding/neteq/neteq_impl.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 118 matching lines @@
   bool SetMinimumDelay(int delay_ms) override;
 
   bool SetMaximumDelay(int delay_ms) override;
 
   int LeastRequiredDelayMs() const override;
 
   int SetTargetDelay() override;
 
   int TargetDelay() override;
 
-  int CurrentDelay() override;
+  int CurrentDelayMs() const override;
 
   // Sets the playout mode to |mode|.
   // Deprecated.
   // TODO(henrik.lundin) Delete.
   void SetPlayoutMode(NetEqPlayoutMode mode) override;
 
   // Returns the current playout mode.
   // Deprecated.
   // TODO(henrik.lundin) Delete.
   NetEqPlayoutMode PlayoutMode() const override;
@@ skipping 247 matching lines @@
   // module is designed to compensate for this.
   int decoded_packet_sequence_number_ GUARDED_BY(crit_sect_);
   uint32_t decoded_packet_timestamp_ GUARDED_BY(crit_sect_);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetEqImpl);
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_