content/test/webrtc_audio_device_test.cc - Issue 13006011: Merge 189983 "Add speaker on/off control on Android for WebRTC "

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/test/webrtc_audio_device_test.cc

Issue 13006011: Merge 189983 "Add speaker on/off control on Android for WebRTC " (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/

Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/media/audio_input_device_manager_unittest.cc ('k') | media/audio/audio_input_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/webrtc_audio_device_test.cc

===================================================================

--- content/test/webrtc_audio_device_test.cc (revision 190471)

+++ content/test/webrtc_audio_device_test.cc (working copy)

@@ -40,6 +40,11 @@

#include "base/win/scoped_com_initializer.h"

#endif

+#if defined(OS_ANDROID)

+#include "base/android/jni_android.h"

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

+#endif

using testing::_;

using testing::InvokeWithoutArgs;

using testing::Return;

@@ -124,6 +129,11 @@

WebRTCAudioDeviceTest::~WebRTCAudioDeviceTest() {}

void WebRTCAudioDeviceTest::SetUp() {

+#if defined(OS_ANDROID)

+ media::AudioManagerBase::RegisterAudioManager(

+ base::android::AttachCurrentThread());

+#endif

// This part sets up a RenderThread environment to ensure that

// RenderThread::current() (<=> TLS pointer) is valid.

// Main parts are inspired by the RenderViewFakeResourcesTest.