Revert 217768 "Adding key press detection in the browser process."

trunk/src/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/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "media/audio/audio_input_controller.h"
@@ skipping 65 matching lines @@
 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,
-                                   AudioManagerBase::kDefaultDeviceId,
-                                   NULL);
+      AudioInputController::Create(audio_manager.get(), &event_handler, params,
+                                   AudioManagerBase::kDefaultDeviceId);
   ASSERT_TRUE(controller.get());
 
   // Wait for OnCreated() to fire.
   message_loop_.Run();
 
   // Close the AudioInputController synchronously.
   CloseAudioController(controller.get());
 }
 
 // Test a normal call sequence of create, record and close.
@@ skipping 14 matching lines @@
       .Times(AtLeast(10))
       .WillRepeatedly(CheckCountAndPostQuitTask(&count, 10,
           message_loop_.message_loop_proxy()));
 
   scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
 
   // Creating the AudioInputController should render an OnCreated() call.
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(audio_manager.get(),
-                                   &event_handler,
-                                   params,
-                                   AudioManagerBase::kDefaultDeviceId,
-                                   NULL);
+      AudioInputController::Create(audio_manager.get(), &event_handler, params,
+                                   AudioManagerBase::kDefaultDeviceId);
   ASSERT_TRUE(controller.get());
 
   // Start recording and trigger one OnRecording() call.
   controller->Record();
 
   // Record and wait until ten OnData() callbacks are received.
   message_loop_.Run();
 
   // Close the AudioInputController synchronously.
   CloseAudioController(controller.get());
@@ skipping 25 matching lines @@
   EXPECT_CALL(event_handler, OnError(NotNull()))
       .Times(Exactly(1))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
 
   // Creating the AudioInputController should render an OnCreated() call.
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(audio_manager.get(),
-                                   &event_handler,
-                                   params,
-                                   AudioManagerBase::kDefaultDeviceId,
-                                   NULL);
+      AudioInputController::Create(audio_manager.get(), &event_handler, params,
+                                   AudioManagerBase::kDefaultDeviceId);
   ASSERT_TRUE(controller.get());
 
   // Start recording and trigger one OnRecording() call.
   controller->Record();
 
   // Record and wait until ten OnData() callbacks are received.
   message_loop_.Run();
 
   // Stop the stream and verify that OnError() is posted.
   AudioInputStream* stream = controller->stream_for_testing();
   stream->Stop();
   message_loop_.Run();
 
   // Close the AudioInputController synchronously.
   CloseAudioController(controller.get());
 }
 
 // Test that AudioInputController rejects insanely large packet sizes.
 TEST_F(AudioInputControllerTest, SamplesPerPacketTooLarge) {
   // Create an audio device with a very large packet size.
   MockAudioInputControllerEventHandler event_handler;
 
   // OnCreated() shall not be called in this test.
   EXPECT_CALL(event_handler, OnCreated(NotNull()))
     .Times(Exactly(0));
 
   scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
-  AudioParameters params(AudioParameters::AUDIO_FAKE,
-                         kChannelLayout,
-                         kSampleRate,
-                         kBitsPerSample,
-                         kSamplesPerPacket * 1000);
+  AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
+                         kSampleRate, kBitsPerSample, kSamplesPerPacket * 1000);
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(audio_manager.get(),
-                                   &event_handler,
-                                   params,
-                                   AudioManagerBase::kDefaultDeviceId,
-                                   NULL);
+      AudioInputController::Create(audio_manager.get(), &event_handler, params,
+                                   AudioManagerBase::kDefaultDeviceId);
   ASSERT_FALSE(controller.get());
 }
 
 // Test calling AudioInputController::Close multiple times.
 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);
+  AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
+                         kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(audio_manager.get(),
-                                   &event_handler,
-                                   params,
-                                   AudioManagerBase::kDefaultDeviceId,
-                                   NULL);
+      AudioInputController::Create(audio_manager.get(), &event_handler, params,
+                                   AudioManagerBase::kDefaultDeviceId);
   ASSERT_TRUE(controller.get());
 
   controller->Record();
 
   controller->Close(base::MessageLoop::QuitClosure());
   base::MessageLoop::current()->Run();
 
   controller->Close(base::MessageLoop::QuitClosure());
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace media