Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)"

webrtc/modules/audio_coding/neteq/dtmf_buffer.cc

 /*
  *  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.
  */
 
 #include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
 
 #include <assert.h>
 #include <algorithm>  // max
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 
 // Modify the code to obtain backwards bit-exactness. Once bit-exactness is no
 // longer required, this #define should be removed (and the code that it
 // enables).
 #define LEGACY_BITEXACT
 
 namespace webrtc {
 
 DtmfBuffer::DtmfBuffer(int fs_hz) {
   SetSampleRate(fs_hz);
@@ skipping 211 matching lines @@
 // that belong to the same events, and therefore sharing the same start
 // timestamp, have already been merged before the sort method is called.
 bool DtmfBuffer::CompareEvents(const DtmfEvent& a, const DtmfEvent& b) {
   if (a.timestamp == b.timestamp) {
     return a.event_no < b.event_no;
   }
   // Take wrap-around into account.
   return (static_cast<uint32_t>(b.timestamp - a.timestamp) < 0xFFFFFFFF / 2);
 }
 }  // namespace webrtc