Revert 190475 "Merge 189983 "Add speaker on/off control on Andro..."

media/audio/audio_input_device_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
 #include "media/audio/win/audio_manager_win.h"
 #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
 // Windows.
 class AudioInputDeviceTest
     : 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)
   bool SetMMDeviceEnumeration() {
     AudioManagerWin* amw = static_cast<AudioManagerWin*>(audio_manager_.get());
     // Windows Wave is used as default if Windows XP was detected =>
     // return false since MMDevice is not supported on XP.
     if (amw->enumeration_type() == AudioManagerWin::kWaveEnumeration)
       return false;
 
@@ skipping 149 matching lines @@
       // MMDevice-style device IDs should be converted to WaveIn-style device
       // IDs.
       EXPECT_NE(i->unique_id, converted_id);
     }
   }
 }
 
 #endif
 
 }  // namespace media