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

Unified Diff: media/audio/audio_input_device_unittest.cc

Issue 13288002: Revert 190475 "Merge 189983 "Add speaker on/off control on Andro..." (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 | « media/audio/audio_input_controller_unittest.cc ('k') | media/audio/audio_input_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_input_device_unittest.cc
===================================================================
--- media/audio/audio_input_device_unittest.cc (revision 191282)
+++ media/audio/audio_input_device_unittest.cc (working copy)
@@ -15,11 +15,6 @@
#include "media/audio/win/wavein_input_win.h"
#endif
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "media/audio/audio_manager_base.h"
-#endif
-
namespace media {
// Test fixture which allows us to override the default enumeration API on
@@ -28,15 +23,11 @@
: public ::testing::Test {
protected:
AudioInputDeviceTest()
+ : audio_manager_(AudioManager::Create())
#if defined(OS_WIN)
- : com_init_(base::win::ScopedCOMInitializer::kMTA)
+ , com_init_(base::win::ScopedCOMInitializer::kMTA)
#endif
{
-#if defined(OS_ANDROID)
- media::AudioManagerBase::RegisterAudioManager(
- base::android::AttachCurrentThread());
-#endif
- audio_manager_.reset(AudioManager::Create());
}
#if defined(OS_WIN)
« no previous file with comments | « media/audio/audio_input_controller_unittest.cc ('k') | media/audio/audio_input_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698