Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to s…

content/browser/renderer_host/media/audio_renderer_host.cc

Index: content/browser/renderer_host/media/audio_renderer_host.cc
===================================================================
--- content/browser/renderer_host/media/audio_renderer_host.cc	(revision 128803)
+++ content/browser/renderer_host/media/audio_renderer_host.cc	(working copy)
@@ -12,7 +12,6 @@
 #include "content/browser/renderer_host/media/audio_sync_reader.h"
 #include "content/common/media/audio_messages.h"
 #include "content/public/browser/media_observer.h"
-#include "content/public/browser/resource_context.h"
 #include "media/audio/audio_util.h"
 
 using content::BrowserMessageFilter;
@@ -28,10 +27,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // AudioRendererHost implementations.
 AudioRendererHost::AudioRendererHost(
-    content::ResourceContext* resource_context,
-    AudioManager* audio_manager)
-    : resource_context_(resource_context),
-      audio_manager_(audio_manager) {
+    AudioManager* audio_manager,
+    content::MediaObserver* media_observer)
+    : audio_manager_(audio_manager),
+      media_observer_(media_observer) {
 }
 
 AudioRendererHost::~AudioRendererHost() {
@@ -41,9 +40,6 @@
 void AudioRendererHost::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
 
-  // Channel is closing, so |resource_context_| is about to become invalid.
-  resource_context_ = NULL;
-
   // Since the IPC channel is gone, close all requested audio streams.
   DeleteEntries();
 }
@@ -240,8 +236,8 @@
   // to the map.
   entry->stream_id = stream_id;
   audio_entries_.insert(std::make_pair(stream_id, entry.release()));
-  if (GetMediaObserver())
-    GetMediaObserver()->OnSetAudioStreamStatus(this, stream_id, "created");
+  if (media_observer_)
+    media_observer_->OnSetAudioStreamStatus(this, stream_id, "created");
 }
 
 void AudioRendererHost::OnPlayStream(int stream_id) {
@@ -254,8 +250,8 @@
   }
 
   entry->controller->Play();
-  if (GetMediaObserver())
-    GetMediaObserver()->OnSetAudioStreamPlaying(this, stream_id, true);
+  if (media_observer_)
+    media_observer_->OnSetAudioStreamPlaying(this, stream_id, true);
 }
 
 void AudioRendererHost::OnPauseStream(int stream_id) {
@@ -268,8 +264,8 @@
   }
 
   entry->controller->Pause();
-  if (GetMediaObserver())
-    GetMediaObserver()->OnSetAudioStreamPlaying(this, stream_id, false);
+  if (media_observer_)
+    media_observer_->OnSetAudioStreamPlaying(this, stream_id, false);
 }
 
 void AudioRendererHost::OnFlushStream(int stream_id) {
@@ -282,15 +278,15 @@
   }
 
   entry->controller->Flush();
-  if (GetMediaObserver())
-    GetMediaObserver()->OnSetAudioStreamStatus(this, stream_id, "flushed");
+  if (media_observer_)
+    media_observer_->OnSetAudioStreamStatus(this, stream_id, "flushed");
 }
 
 void AudioRendererHost::OnCloseStream(int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  if (GetMediaObserver())
-    GetMediaObserver()->OnSetAudioStreamStatus(this, stream_id, "closed");
+  if (media_observer_)
+    media_observer_->OnSetAudioStreamStatus(this, stream_id, "closed");
 
   AudioEntry* entry = LookupById(stream_id);
 
@@ -311,8 +307,8 @@
   if (volume < 0 || volume > 1.0)
     return;
   entry->controller->SetVolume(volume);
-  if (GetMediaObserver())
-    GetMediaObserver()->OnSetAudioStreamVolume(this, stream_id, volume);
+  if (media_observer_)
+    media_observer_->OnSetAudioStreamVolume(this, stream_id, volume);
 }
 
 void AudioRendererHost::SendErrorMessage(int32 stream_id) {
@@ -356,8 +352,8 @@
   audio_entries_.erase(entry->stream_id);
 
   // Notify the media observer.
-  if (GetMediaObserver())
-    GetMediaObserver()->OnDeleteAudioStream(this, entry->stream_id);
+  if (media_observer_)
+    media_observer_->OnDeleteAudioStream(this, entry->stream_id);
 }
 
 void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
@@ -367,8 +363,8 @@
   // |entry| is destroyed in DeleteEntry().
   SendErrorMessage(entry->stream_id);
 
-  if (GetMediaObserver())
-    GetMediaObserver()->OnSetAudioStreamStatus(this, entry->stream_id, "error");
+  if (media_observer_)
+    media_observer_->OnSetAudioStreamStatus(this, entry->stream_id, "error");
   CloseAndDeleteStream(entry);
 }
 
@@ -394,10 +390,3 @@
   }
   return NULL;
 }
-
-content::MediaObserver* AudioRendererHost::GetMediaObserver() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (resource_context_)
-    return resource_context_->GetMediaObserver();
-  return NULL;
-}