diff options
Diffstat (limited to 'chromium/media/audio/audio_output_device_unittest.cc')
| -rw-r--r-- | chromium/media/audio/audio_output_device_unittest.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/chromium/media/audio/audio_output_device_unittest.cc b/chromium/media/audio/audio_output_device_unittest.cc index 96da77d7404..7aca2627745 100644 --- a/chromium/media/audio/audio_output_device_unittest.cc +++ b/chromium/media/audio/audio_output_device_unittest.cc @@ -12,7 +12,6 @@ #include "base/test/test_timeouts.h" #include "media/audio/audio_output_device.h" #include "media/audio/sample_rates.h" -#include "media/audio/shared_memory_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock_mutant.h" #include "testing/gtest/include/gtest/gtest.h" @@ -124,8 +123,6 @@ class AudioOutputDeviceTest DISALLOW_COPY_AND_ASSIGN(AudioOutputDeviceTest); }; -static const int kStreamId = 123; - int AudioOutputDeviceTest::CalculateMemorySize() { // Calculate output and input memory size. int output_memory_size = @@ -135,13 +132,7 @@ int AudioOutputDeviceTest::CalculateMemorySize() { int input_memory_size = AudioBus::CalculateMemorySize(input_channels_, frames); - int io_buffer_size = output_memory_size + input_memory_size; - - // This is where it gets a bit hacky. The shared memory contract between - // AudioOutputDevice and its browser side counter part includes a bit more - // than just the audio data, so we must call TotalSharedMemorySizeInBytes() - // to get the actual size needed to fit the audio data plus the extra data. - return TotalSharedMemorySizeInBytes(io_buffer_size); + return output_memory_size + input_memory_size; } AudioOutputDeviceTest::AudioOutputDeviceTest() @@ -195,7 +186,7 @@ void AudioOutputDeviceTest::CreateStream() { &duplicated_memory_handle)); audio_device_->OnStreamCreated(duplicated_memory_handle, audio_device_socket, - PacketSizeInBytes(kMemorySize)); + kMemorySize); io_loop_.RunUntilIdle(); } |