Change audio render thread checking to use new AudioRendererSink::BelongsToRendererThread()

content/renderer/media/webrtc_audio_device_impl.cc

 // Copyright 2013 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.
 
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
 #include "content/renderer/media/webrtc/processed_local_audio_source.h"
@@ skipping 44 matching lines @@
   if (ret == 0) {
     delete this;
   }
   return ret;
 }
 
 void WebRtcAudioDeviceImpl::RenderData(media::AudioBus* audio_bus,
                                        int sample_rate,
                                        int audio_delay_milliseconds,
                                        base::TimeDelta* current_time) {
-  DCHECK(audio_renderer_thread_checker_.CalledOnValidThread());
+#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
+  {
+    base::AutoLock auto_lock(lock_);

[tommi (sloooow) - chröme, 2016/06/13 14:15:20]

we grab this lock right after this block.  Can we just grab it once and have
this code + #ifdefs inside the below scope?

[Henrik Grunell, 2016/06/13 20:38:35]

Yeah, that's better locking wise (in builds with DCHECKs enabled), this is
slightly more readable imo. Let's minimize locking, I'll change that.

[Henrik Grunell, 2016/06/14 11:30:00]

Done.

+    bool on_rendering_thread = renderer_->BelongsToRenderingThread();
+    DCHECK(on_rendering_thread);

[tommi (sloooow) - chröme, 2016/06/13 14:15:20]

doesn't look like you need this variable.  Just do
DCHECK(renderer_->BelongsToRenderingThread());

[Henrik Grunell, 2016/06/14 11:30:00]

Oops, left by mistake. Done.

+    if (!audio_renderer_thread_checker_.CalledOnValidThread()) {
+      for (PlayoutDataSinkList::const_iterator it = playout_sinks_.begin();

[tommi (sloooow) - chröme, 2016/06/13 14:15:21]

range based loop?

[Henrik Grunell, 2016/06/14 11:30:00]

Done.

+           it != playout_sinks_.end(); ++it) {
+        (*it)->OnRenderThreadChanged();
+      }
+    }
+  }
+#endif
+
   {
     base::AutoLock auto_lock(lock_);
     if (!playing_) {
       // Force silence to AudioBus after stopping playout in case
       // there is lingering audio data in AudioBus.
       audio_bus->Zero();
       return;
     }
     DCHECK(audio_transport_callback_);
     // Store the reported audio delay locally.
@@ skipping 404 matching lines @@
 
   *session_id = device_info.session_id;
   *output_sample_rate = device_info.device.matched_output.sample_rate;
   *output_frames_per_buffer =
       device_info.device.matched_output.frames_per_buffer;
 
   return true;
 }
 
 }  // namespace content