Merge 189983 "Add speaker on/off control on Android for WebRTC "

content/browser/renderer_host/media/audio_input_device_manager_unittest.cc

Index: content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
===================================================================
--- content/browser/renderer_host/media/audio_input_device_manager_unittest.cc	(revision 190471)
+++ content/browser/renderer_host/media/audio_input_device_manager_unittest.cc	(working copy)
@@ -16,6 +16,11 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "media/audio/audio_manager_base.h"
+#endif
+
 using testing::_;
 using testing::InSequence;
 using testing::SaveArg;
@@ -87,6 +92,11 @@
     io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
                                            message_loop_.get()));
 
+#if defined(OS_ANDROID)
+    media::AudioManagerBase::RegisterAudioManager(
+        base::android::AttachCurrentThread());
+#endif
+
     audio_manager_.reset(media::AudioManager::Create());
     manager_ = new AudioInputDeviceManager(audio_manager_.get());
     audio_input_listener_.reset(new MockAudioInputDeviceManagerListener());