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

media/audio/audio_input_controller_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/basictypes.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "media/audio/audio_input_controller.h"
@@ skipping 54 matching lines @@
   virtual ~AudioInputControllerTest() {}
 
  protected:
   MessageLoop message_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioInputControllerTest);
 };
 
 // Test AudioInputController for create and close 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_CreateAndClose DISABLED_CreateAndClose
-#else
-#define MAYBE_CreateAndClose CreateAndClose
-#endif
-TEST_F(AudioInputControllerTest, MAYBE_CreateAndClose) {
+TEST_F(AudioInputControllerTest, CreateAndClose) {
   MockAudioInputControllerEventHandler event_handler;
 
   // OnCreated() will be posted once.
   EXPECT_CALL(event_handler, OnCreated(NotNull()))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
       AudioInputController::Create(audio_manager.get(), &event_handler, params);
   ASSERT_TRUE(controller.get());
 
   // Wait for OnCreated() to fire.
   message_loop_.Run();
 
   // Close the AudioInputController synchronously.
   CloseAudioController(controller);
 }
 
 // Test a normal call sequence of create, record and close.
-// 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_RecordAndClose DISABLED_RecordAndClose
-#else
-#define MAYBE_RecordAndClose RecordAndClose
-#endif
-TEST_F(AudioInputControllerTest, MAYBE_RecordAndClose) {
+TEST_F(AudioInputControllerTest, RecordAndClose) {
   MockAudioInputControllerEventHandler event_handler;
   int count = 0;
 
   // OnCreated() will be called once.
   EXPECT_CALL(event_handler, OnCreated(NotNull()))
       .Times(Exactly(1));
 
   // OnRecording() will be called only once.
   EXPECT_CALL(event_handler, OnRecording(NotNull()))
       .Times(Exactly(1));
@@ skipping 19 matching lines @@
   // Record and wait until ten OnData() callbacks are received.
   message_loop_.Run();
 
   // Close the AudioInputController synchronously.
   CloseAudioController(controller);
 }
 
 // Test that the AudioInputController reports an error when the input stream
 // stops without an OnClose() callback. This can happen when the underlying
 // audio layer stops feeding data as a result of a removed microphone device.
-// TODO(leozwang): Because java calls were introduced in audio_manager_base,
-// unit test has to register jni first to make unit test run.
-#if defined(OS_ANDROID)
-#define MAYBE_RecordAndError DISABLED_RecordAndError
-#else
-#define MAYBE_RecordAndError RecordAndError
-#endif
-TEST_F(AudioInputControllerTest, MAYBE_RecordAndError) {
+TEST_F(AudioInputControllerTest, RecordAndError) {
   MockAudioInputControllerEventHandler event_handler;
   int count = 0;
 
   // OnCreated() will be called once.
   EXPECT_CALL(event_handler, OnCreated(NotNull()))
       .Times(Exactly(1));
 
   // OnRecording() will be called only once.
   EXPECT_CALL(event_handler, OnRecording(NotNull()))
       .Times(Exactly(1));
@@ skipping 45 matching lines @@
 
   scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket * 1000);
   scoped_refptr<AudioInputController> controller =
       AudioInputController::Create(audio_manager.get(), &event_handler, params);
   ASSERT_FALSE(controller);
 }
 
 // Test calling AudioInputController::Close multiple times.
-#if defined(OS_ANDROID)
-#define MAYBE_CloseTwice DISABLED_CloseTwice
-#else
-#define MAYBE_CloseTwice CloseTwice
-#endif
-TEST_F(AudioInputControllerTest, MAYBE_CloseTwice) {
+TEST_F(AudioInputControllerTest, CloseTwice) {
   MockAudioInputControllerEventHandler event_handler;
 
   // OnRecording() will be called only once.
   EXPECT_CALL(event_handler, OnCreated(NotNull()));
 
   // OnRecording() will be called only once.
   EXPECT_CALL(event_handler, OnRecording(NotNull()))
       .Times(Exactly(1));
 
   scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
       AudioInputController::Create(audio_manager.get(), &event_handler, params);
   ASSERT_TRUE(controller.get());
 
   controller->Record();
 
   controller->Close(MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
 
   controller->Close(MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
 }
 
 }  // namespace media