diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-25 15:27:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-25 15:27:18 +0000 |
| commit | dc73a7bd4926f66683849cb2ad277e4fc4ae4d57 (patch) | |
| tree | 7a02b53920ccc3292b403ff43f5890dfabbd50c0 /content/test/webrtc_audio_device_test.cc | |
| parent | 4af3cc758ddb8f642d068d9c10d9563306bf5c50 (diff) | |
| download | chromium_src-dc73a7bd4926f66683849cb2ad277e4fc4ae4d57.zip chromium_src-dc73a7bd4926f66683849cb2ad277e4fc4ae4d57.tar.gz chromium_src-dc73a7bd4926f66683849cb2ad277e4fc4ae4d57.tar.bz2 | |
Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to support one.
BUG=98716
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128789
Review URL: https://chromiumcodereview.appspot.com/9845033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/webrtc_audio_device_test.cc')
| -rw-r--r-- | content/test/webrtc_audio_device_test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc index d13f79ca..cb37584 100644 --- a/content/test/webrtc_audio_device_test.cc +++ b/content/test/webrtc_audio_device_test.cc @@ -170,7 +170,6 @@ void WebRTCAudioDeviceTest::InitializeIOThread(const char* thread_name) { test_request_context_ = new TestURLRequestContext(); resource_context_->set_request_context(test_request_context_.get()); media_observer_.reset(new MockMediaObserver()); - resource_context_->set_media_observer(media_observer_.get()); // Create an IPC channel that handles incoming messages on the IO thread. CreateChannel(thread_name); @@ -187,7 +186,7 @@ void WebRTCAudioDeviceTest::UninitializeIOThread() { void WebRTCAudioDeviceTest::CreateChannel(const char* name) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); audio_render_host_ = new AudioRendererHost( - resource_context_.get(), audio_manager_.get()); + audio_manager_.get(), media_observer_.get()); audio_render_host_->OnChannelConnected(base::GetCurrentProcId()); audio_input_renderer_host_ = new AudioInputRendererHost( |