Roll WebRTC 11486:11495, Libjingle 11485:11495

content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_LOCAL_AUDIO_TRACK_ADAPTER_H_
 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_LOCAL_AUDIO_TRACK_ADAPTER_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreamtrack.h"
-#include "third_party/libjingle/source/talk/media/base/audiorenderer.h"
+#include "third_party/webrtc/media/base/audiorenderer.h"
 
 namespace cricket {
 class AudioRenderer;
 }
 
 namespace webrtc {
 class AudioSourceInterface;
 class AudioProcessorInterface;
 }
 
@@ skipping 72 matching lines @@
   base::ThreadChecker signaling_thread_checker_;
   base::ThreadChecker capture_thread_;
 
   // Protects |voe_channels_|, |audio_processor_| and |signal_level_|.
   mutable base::Lock lock_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_LOCAL_AUDIO_TRACK_ADAPTER_H_