Revert of Move webrtc/audio/audio_sink.h to webrtc/ and fix some dependencies.

webrtc/api/remoteaudiosource.h

 /*
  *  Copyright 2014 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_API_REMOTEAUDIOSOURCE_H_
 #define WEBRTC_API_REMOTEAUDIOSOURCE_H_
 
 #include <list>
 #include <string>
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/notifier.h"
-#include "webrtc/audio_sink.h"
+#include "webrtc/audio/audio_sink.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/media/base/audiorenderer.h"
 
 namespace rtc {
 struct Message;
 class Thread;
 }  // namespace rtc
 
 namespace webrtc {
 
@@ skipping 40 matching lines @@
   AudioObserverList audio_observers_;
   rtc::CriticalSection sink_lock_;
   std::list<AudioTrackSinkInterface*> sinks_;
   rtc::Thread* const main_thread_;
   SourceState state_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_REMOTEAUDIOSOURCE_H_