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

webrtc/modules/audio_device/android/audio_track_jni.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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_TRACK_JNI_H_
 #define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_TRACK_JNI_H_
 
 #include <memory>
 
 #include <jni.h>
 
+#include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/audio_device/android/audio_common.h"
 #include "webrtc/modules/audio_device/android/audio_manager.h"
+#include "webrtc/modules/audio_device/include/audio_device_defines.h"
 #include "webrtc/modules/audio_device/audio_device_generic.h"
-#include "webrtc/modules/audio_device/include/audio_device_defines.h"
 #include "webrtc/modules/utility/include/helpers_android.h"
 #include "webrtc/modules/utility/include/jvm_android.h"
-#include "webrtc/rtc_base/thread_checker.h"
 
 namespace webrtc {
 
 // Implements 16-bit mono PCM audio output support for Android using the Java
 // AudioTrack interface. Most of the work is done by its Java counterpart in
 // WebRtcAudioTrack.java. This class is created and lives on a thread in
 // C++-land, but decoded audio buffers are requested on a high-priority
 // thread managed by the Java class.
 //
 // An instance must be created and destroyed on one and the same thread.
@@ skipping 111 matching lines @@
   // Raw pointer handle provided to us in AttachAudioBuffer(). Owned by the
   // AudioDeviceModuleImpl class and called by AudioDeviceModule::Create().
   // The AudioDeviceBuffer is a member of the AudioDeviceModuleImpl instance
   // and therefore outlives this object.
   AudioDeviceBuffer* audio_device_buffer_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_TRACK_JNI_H_