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

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

Issue 22871007: Revert 217768 "Adding key press detection in the browser process." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 245
246 void MAYBE_WebRTCAudioDeviceTest::CreateChannel(const char* name) { 246 void MAYBE_WebRTCAudioDeviceTest::CreateChannel(const char* name) {
247 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 247 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
248 248
249 static const int kRenderProcessId = 1; 249 static const int kRenderProcessId = 1;
250 audio_render_host_ = new AudioRendererHost( 250 audio_render_host_ = new AudioRendererHost(
251 kRenderProcessId, audio_manager_.get(), mirroring_manager_.get(), 251 kRenderProcessId, audio_manager_.get(), mirroring_manager_.get(),
252 media_internals_.get(), media_stream_manager_.get()); 252 media_internals_.get(), media_stream_manager_.get());
253 audio_render_host_->OnChannelConnected(base::GetCurrentProcId()); 253 audio_render_host_->OnChannelConnected(base::GetCurrentProcId());
254 254
255 audio_input_renderer_host_ = 255 audio_input_renderer_host_ = new AudioInputRendererHost(
256 new AudioInputRendererHost(audio_manager_.get(), 256 audio_manager_.get(), media_stream_manager_.get(),
257 media_stream_manager_.get(), 257 mirroring_manager_.get());
258 mirroring_manager_.get(),
259 NULL);
260 audio_input_renderer_host_->OnChannelConnected(base::GetCurrentProcId()); 258 audio_input_renderer_host_->OnChannelConnected(base::GetCurrentProcId());
261 259
262 channel_.reset(new IPC::Channel(name, IPC::Channel::MODE_SERVER, this)); 260 channel_.reset(new IPC::Channel(name, IPC::Channel::MODE_SERVER, this));
263 ASSERT_TRUE(channel_->Connect()); 261 ASSERT_TRUE(channel_->Connect());
264 262
265 audio_render_host_->OnFilterAdded(channel_.get()); 263 audio_render_host_->OnFilterAdded(channel_.get());
266 audio_input_renderer_host_->OnFilterAdded(channel_.get()); 264 audio_input_renderer_host_->OnFilterAdded(channel_.get());
267 } 265 }
268 266
269 void MAYBE_WebRTCAudioDeviceTest::DestroyChannel() { 267 void MAYBE_WebRTCAudioDeviceTest::DestroyChannel() {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) { 368 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) {
371 return network_->ReceivedRTPPacket(channel, data, len); 369 return network_->ReceivedRTPPacket(channel, data, len);
372 } 370 }
373 371
374 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data, 372 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data,
375 int len) { 373 int len) {
376 return network_->ReceivedRTCPPacket(channel, data, len); 374 return network_->ReceivedRTCPPacket(channel, data, len);
377 } 375 }
378 376
379 } // namespace content 377 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/renderer/media/webrtc_local_audio_track_unittest.cc ('k') | trunk/src/media/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698