Revert 189210 "Add MODIFY_AUDIO_SETTINGS permission in Android m..."

media/audio/audio_input_unittest.cc

Index: media/audio/audio_input_unittest.cc
===================================================================
--- media/audio/audio_input_unittest.cc	(revision 191286)
+++ media/audio/audio_input_unittest.cc	(working copy)
@@ -110,12 +110,7 @@
 }
 
 // Test create and close of an AudioInputStream without recording audio.
-#if defined(OS_ANDROID)
-#define MAYBE_CreateAndClose DISABLED_CreateAndClose
-#else
-#define MAYBE_CreateAndClose CreateAndClose
-#endif
-TEST(AudioInputTest, MAYBE_CreateAndClose) {
+TEST(AudioInputTest, CreateAndClose) {
   scoped_ptr<AudioManager> audio_man(AudioManager::Create());
   if (!CanRunAudioTests(audio_man.get()))
     return;
@@ -124,14 +119,7 @@
 }
 
 // Test create, open and close of an AudioInputStream without recording audio.
-// TODO(leozwang): Because java calls were introduced in audio_manager_base,
-// unit test has to register jni first, else it will crash.
-#if defined(OS_ANDROID)
-#define MAYBE_OpenAndClose DISABLED_OpenAndClose
-#else
-#define MAYBE_OpenAndClose OpenAndClose
-#endif
-TEST(AudioInputTest, MAYBE_OpenAndClose) {
+TEST(AudioInputTest, OpenAndClose) {
   scoped_ptr<AudioManager> audio_man(AudioManager::Create());
   if (!CanRunAudioTests(audio_man.get()))
     return;
@@ -141,12 +129,7 @@
 }
 
 // Test create, open, stop and close of an AudioInputStream without recording.
-#if defined(OS_ANDROID)
-#define MAYBE_OpenStopAndClose DISABLED_OpenStopAndClose
-#else
-#define MAYBE_OpenStopAndClose OpenStopAndClose
-#endif
-TEST(AudioInputTest, MAYBE_OpenStopAndClose) {
+TEST(AudioInputTest, OpenStopAndClose) {
   scoped_ptr<AudioManager> audio_man(AudioManager::Create());
   if (!CanRunAudioTests(audio_man.get()))
     return;
@@ -157,12 +140,7 @@
 }
 
 // Test a normal recording sequence using an AudioInputStream.
-#if defined(OS_ANDROID)
-#define MAYBE_Record DISABLED_Record
-#else
-#define MAYBE_Record Record
-#endif
-TEST(AudioInputTest, MAYBE_Record) {
+TEST(AudioInputTest, Record) {
   scoped_ptr<AudioManager> audio_man(AudioManager::Create());
   if (!CanRunAudioTests(audio_man.get()))
     return;