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

content/browser/renderer_host/media/audio_renderer_host_unittest.cc

Index: content/browser/renderer_host/media/audio_renderer_host_unittest.cc
===================================================================
--- content/browser/renderer_host/media/audio_renderer_host_unittest.cc	(revision 128803)
+++ content/browser/renderer_host/media/audio_renderer_host_unittest.cc	(working copy)
@@ -12,7 +12,6 @@
 #include "content/browser/renderer_host/media/audio_renderer_host.h"
 #include "content/browser/renderer_host/media/mock_media_observer.h"
 #include "content/common/media/audio_messages.h"
-#include "content/test/mock_resource_context.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/fake_audio_output_stream.h"
@@ -44,9 +43,9 @@
 class MockAudioRendererHost : public AudioRendererHost {
  public:
   explicit MockAudioRendererHost(
-      content::ResourceContext* resource_context,
-      AudioManager* audio_manager)
-      : AudioRendererHost(resource_context, audio_manager),
+      AudioManager* audio_manager,
+      content::MediaObserver* media_observer)
+      : AudioRendererHost(audio_manager, media_observer),
         shared_memory_length_(0) {
   }
 
@@ -164,8 +163,7 @@
                                            message_loop_.get()));
     audio_manager_.reset(AudioManager::Create());
     observer_.reset(new MockMediaObserver());
-    resource_context_.set_media_observer(observer_.get());
-    host_ = new MockAudioRendererHost(&resource_context_, audio_manager_.get());
+    host_ = new MockAudioRendererHost(audio_manager_.get(), observer_.get());
 
     // Simulate IPC channel connected.
     host_->OnChannelConnected(base::GetCurrentProcId());
@@ -313,7 +311,6 @@
   scoped_ptr<BrowserThreadImpl> io_thread_;
   scoped_ptr<BrowserThreadImpl> ui_thread_;
   scoped_ptr<AudioManager> audio_manager_;
-  content::MockResourceContext resource_context_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHostTest);
 };