Simplified AudioOutputStream interface.

1. Removed packet_size parameter from Open().
2. Removed OnClose() from the callback. Now the callback is guaranteed to be called only between Start() and Stop().
3. Added samples_per_packet in the AudioParameters struct.

BUG=39825
TEST=Unittests

Review URL: http://codereview.chromium.org/4661001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65766 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
index 03219f8..ac57d2a 100644
--- a/media/audio/audio_input_controller_unittest.cc
+++ b/media/audio/audio_input_controller_unittest.cc
@@ -55,9 +55,9 @@ TEST(AudioInputControllerTest, CreateAndClose) {
       .WillOnce(InvokeWithoutArgs(&event, &base::WaitableEvent::Signal));
 
   AudioParameters params(AudioParameters::AUDIO_MOCK, kChannels,
-                         kSampleRate, kBitsPerSample);
+                         kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(&event_handler, params, kSamplesPerPacket);
+      AudioInputController::Create(&event_handler, params);
   ASSERT_TRUE(controller.get());
 
   // Wait for OnCreated() to be called.
@@ -86,9 +86,9 @@ TEST(AudioInputControllerTest, RecordAndClose) {
       .WillRepeatedly(CheckCountAndSignalEvent(&count, 10, &event));
 
   AudioParameters params(AudioParameters::AUDIO_MOCK, kChannels,
-                         kSampleRate, kBitsPerSample);
+                         kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(&event_handler, params, kSamplesPerPacket);
+      AudioInputController::Create(&event_handler, params);
   ASSERT_TRUE(controller.get());
 
   // Wait for OnCreated() to be called.
@@ -108,9 +108,9 @@ TEST(AudioInputControllerTest, SamplesPerPacketTooLarge) {
   MockAudioInputControllerEventHandler event_handler;
 
   AudioParameters params(AudioParameters::AUDIO_MOCK, kChannels,
-                         kSampleRate, kBitsPerSample);
+                         kSampleRate, kBitsPerSample, kSamplesPerPacket * 1000);
   scoped_refptr<AudioInputController> controller = AudioInputController::Create(
-      &event_handler, params, kSamplesPerPacket * 1000);
+      &event_handler, params);
   ASSERT_FALSE(controller);
 }
 
@@ -119,9 +119,9 @@ TEST(AudioInputControllerTest, CloseTwice) {
   MockAudioInputControllerEventHandler event_handler;
   EXPECT_CALL(event_handler, OnCreated(NotNull()));
   AudioParameters params(AudioParameters::AUDIO_MOCK, kChannels,
-                         kSampleRate, kBitsPerSample);
+                         kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(&event_handler, params, kSamplesPerPacket);
+      AudioInputController::Create(&event_handler, params);
   ASSERT_TRUE(controller.get());
 
   controller->Close();