Index: content/renderer/media/audio_message_filter.cc |
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc |
index 65c41f34f3d2ae56ae2f96fdf0e59faae6889d4b..a9ebb5dc6d9e0af1793d313fdf9112db0d506c8f 100644 |
--- a/content/renderer/media/audio_message_filter.cc |
+++ b/content/renderer/media/audio_message_filter.cc |
@@ -9,11 +9,23 @@ |
#include "base/time.h" |
#include "content/common/child_process.h" |
#include "content/common/media/audio_messages.h" |
+#include "content/renderer/render_thread_impl.h" |
#include "ipc/ipc_logging.h" |
+AudioMessageFilter* AudioMessageFilter::filter_ = NULL; |
+ |
+// static |
+AudioMessageFilter* AudioMessageFilter::current() { |
+ return filter_; |
+} |
+ |
AudioMessageFilter::AudioMessageFilter() |
: channel_(NULL) { |
VLOG(1) << "AudioMessageFilter::AudioMessageFilter()"; |
+ // DCHECK(RenderThreadImpl::current()) << |
henrika (OOO until Aug 14)
2012/06/26 15:55:48
Will remove this part to simplify unit testing.
henrika (OOO until Aug 14)
2012/06/27 08:23:16
Done.
|
+ // "AudioMessageFilter must be constructed on the render thread"; |
+ DCHECK(!filter_); |
+ filter_ = this; |
} |
int32 AudioMessageFilter::AddDelegate(Delegate* delegate) { |
@@ -69,6 +81,8 @@ void AudioMessageFilter::OnChannelClosing() { |
AudioMessageFilter::~AudioMessageFilter() { |
VLOG(1) << "AudioMessageFilter::~AudioMessageFilter()"; |
+ DCHECK(filter_); |
+ filter_ = NULL; |
} |
void AudioMessageFilter::OnStreamCreated( |