content/renderer/media/webrtc_audio_device_unittest.cc.rej - Issue 12102004: Renderer side audio device change wip...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/webrtc_audio_device_unittest.cc.rej

Issue 12102004: Renderer side audio device change wip... Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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:

Index: content/renderer/media/webrtc_audio_device_unittest.cc.rej

diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc.rej b/content/renderer/media/webrtc_audio_device_unittest.cc.rej

new file mode 100644

index 0000000000000000000000000000000000000000..3acf363676769cc7877b5814e6cf1a15f46f58a4

--- /dev/null

+++ b/content/renderer/media/webrtc_audio_device_unittest.cc.rej

@@ -0,0 +1,16 @@

+diff a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc (rejected hunks)

+@@ -4,11 +4,12 @@

+ #include "base/environment.h"

+ #include "base/test/test_timeouts.h"

+-#include "content/renderer/media/audio_hardware.h"

++#include "content/renderer/media/renderer_audio_hardware_config.h"

+ #include "content/renderer/media/webrtc_audio_device_impl.h"

+ #include "content/renderer/media/webrtc_audio_renderer.h"

++#include "content/renderer/render_thread_impl.h"

+ #include "content/test/webrtc_audio_device_test.h"

+-#include "media/audio/audio_manager.h"

++#include "media/audio/audio_manager_base.h"

+ #include "media/audio/audio_util.h"

+ #include "testing/gmock/include/gmock/gmock.h"

+ #include "third_party/webrtc/voice_engine/include/voe_audio_processing.h"