Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(766)

Side by Side Diff: content/test/webrtc_audio_device_test.cc

Issue 9433006: Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix deps Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/test/webrtc_audio_device_test.h" 5 #include "content/test/webrtc_audio_device_test.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 io_thread_.reset(new content::TestBrowserThread(content::BrowserThread::IO, 162 io_thread_.reset(new content::TestBrowserThread(content::BrowserThread::IO,
163 MessageLoop::current())); 163 MessageLoop::current()));
164 164
165 audio_manager_.reset(AudioManager::Create()); 165 audio_manager_.reset(AudioManager::Create());
166 166
167 // Populate our resource context. 167 // Populate our resource context.
168 test_request_context_ = new TestURLRequestContext(); 168 test_request_context_ = new TestURLRequestContext();
169 resource_context_->set_request_context(test_request_context_.get()); 169 resource_context_->set_request_context(test_request_context_.get());
170 media_observer_.reset(new MockMediaObserver()); 170 media_observer_.reset(new MockMediaObserver());
171 resource_context_->set_media_observer(media_observer_.get()); 171 resource_context_->set_media_observer(media_observer_.get());
172 media_stream_manager_.reset(new media_stream::MediaStreamManager(
173 audio_manager_.get()));
174 resource_context_->set_media_stream_manager(media_stream_manager_.get());
175 resource_context_->set_audio_manager(audio_manager_.get());
176 172
177 // Create an IPC channel that handles incoming messages on the IO thread. 173 // Create an IPC channel that handles incoming messages on the IO thread.
178 CreateChannel(thread_name); 174 CreateChannel(thread_name);
179 } 175 }
180 176
181 void WebRTCAudioDeviceTest::UninitializeIOThread() { 177 void WebRTCAudioDeviceTest::UninitializeIOThread() {
182 resource_context_.reset(); 178 resource_context_.reset();
183 media_stream_manager_.reset();
184 179
185 audio_manager_.reset(); 180 audio_manager_.reset();
186 test_request_context_ = NULL; 181 test_request_context_ = NULL;
187 initialize_com_.reset(); 182 initialize_com_.reset();
188 } 183 }
189 184
190 void WebRTCAudioDeviceTest::CreateChannel(const char* name) { 185 void WebRTCAudioDeviceTest::CreateChannel(const char* name) {
191 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); 186 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
192 audio_render_host_ = new AudioRendererHost(resource_context_.get()); 187 audio_render_host_ = new AudioRendererHost(resource_context_.get());
193 audio_render_host_->OnChannelConnected(base::GetCurrentProcId()); 188 audio_render_host_->OnChannelConnected(base::GetCurrentProcId());
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 WebRTCTransportImpl::~WebRTCTransportImpl() {} 315 WebRTCTransportImpl::~WebRTCTransportImpl() {}
321 316
322 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) { 317 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) {
323 return network_->ReceivedRTPPacket(channel, data, len); 318 return network_->ReceivedRTPPacket(channel, data, len);
324 } 319 }
325 320
326 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data, 321 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data,
327 int len) { 322 int len) {
328 return network_->ReceivedRTCPPacket(channel, data, len); 323 return network_->ReceivedRTCPPacket(channel, data, len);
329 } 324 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698