NetEq: Remove special case for Merge without Expand

webrtc/modules/audio_coding/neteq/decision_logic_normal.h

 /*
  *  Copyright (c) 2013 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 22 matching lines @@
       : DecisionLogic(fs_hz,
                       output_size_samples,
                       playout_mode,
                       decoder_database,
                       packet_buffer,
                       delay_manager,
                       buffer_level_filter,
                       tick_timer) {}
 
  protected:
-  static const int kAllowMergeWithoutExpandMs = 20;  // 20 ms.
   static const int kReinitAfterExpands = 100;
   static const int kMaxWaitForPacket = 10;
 
   // Returns the operation that should be done next. |sync_buffer| and |expand|
   // are provided for reference. |decoder_frame_length| is the number of samples
   // obtained from the last decoded frame. If there is a packet available, the
   // packet header should be supplied in |packet_header|; otherwise it should
   // be NULL. The mode resulting form the last call to NetEqImpl::GetAudio is
   // supplied in |prev_mode|. If there is a DTMF event to play, |play_dtmf|
   // should be set to true. The output variable |reset_decoder| will be set to
@@ skipping 54 matching lines @@
   bool PacketTooEarly(uint32_t timestamp_leap) const;
 
   // Checks if num_consecutive_expands_ >= kMaxWaitForPacket.
   bool MaxWaitForPacket() const;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(DecisionLogicNormal);
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_NORMAL_H_