| Index: content/browser/renderer_host/media/audio_debug_file_writer_unittest.cc
|
| diff --git a/content/browser/renderer_host/media/audio_debug_file_writer_unittest.cc b/content/browser/renderer_host/media/audio_debug_file_writer_unittest.cc
|
| index 4ececd04cd85c127731d9a3b81d04132a726a036..8d04869922fca3e75763220591baf8002c149f53 100644
|
| --- a/content/browser/renderer_host/media/audio_debug_file_writer_unittest.cc
|
| +++ b/content/browser/renderer_host/media/audio_debug_file_writer_unittest.cc
|
| @@ -12,6 +12,7 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| #include "media/base/audio_bus.h"
|
| +#include "media/base/audio_sample_types.h"
|
| #include "media/base/test_helpers.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -165,12 +166,12 @@ class AudioDebugFileWriterTest
|
| std::unique_ptr<media::AudioBus> bus = media::AudioBus::Create(
|
| params_.channels(), params_.frames_per_buffer());
|
|
|
| - bus->FromInterleaved(
|
| + bus->FromInterleaved<media::SignedInt16SampleTypeTraits>(
|
| source_interleaved_.get() +
|
| i * params_.channels() * params_.frames_per_buffer(),
|
| - params_.frames_per_buffer(), kBytesPerSample);
|
| + params_.frames_per_buffer());
|
|
|
| - input_debug_writer_->Write(std::move(bus));
|
| + debug_writer_->Write(std::move(bus));
|
| }
|
| }
|
|
|
| @@ -192,11 +193,11 @@ class AudioDebugFileWriterTest
|
| base::FilePath file_path;
|
| EXPECT_TRUE(base::CreateTemporaryFile(&file_path));
|
|
|
| - input_debug_writer_->Start(file_path);
|
| + debug_writer_->Start(file_path);
|
|
|
| DoDebugRecording();
|
|
|
| - input_debug_writer_->Stop();
|
| + debug_writer_->Stop();
|
|
|
| WaitForRecordingCompletion();
|
|
|
| @@ -214,7 +215,7 @@ class AudioDebugFileWriterTest
|
| TestBrowserThreadBundle thread_bundle_;
|
|
|
| // Writer under test.
|
| - std::unique_ptr<AudioDebugFileWriter> input_debug_writer_;
|
| + std::unique_ptr<AudioDebugFileWriter> debug_writer_;
|
|
|
| // AudioBus parameters.
|
| media::AudioParameters params_;
|
| @@ -235,14 +236,19 @@ class AudioDebugFileWriterTest
|
| class AudioDebugFileWriterBehavioralTest : public AudioDebugFileWriterTest {};
|
|
|
| TEST_P(AudioDebugFileWriterTest, WaveRecordingTest) {
|
| - input_debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| -
|
| + debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| RecordAndVerifyOnce();
|
| }
|
|
|
| +TEST_P(AudioDebugFileWriterTest, GetFileNameExtension) {
|
| + debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| + EXPECT_EQ(FILE_PATH_LITERAL("wav"),
|
| + base::FilePath::StringType(debug_writer_->GetFileNameExtension()));
|
| +}
|
| +
|
| TEST_P(AudioDebugFileWriterBehavioralTest,
|
| DeletedBeforeRecordingFinishedOnFileThread) {
|
| - input_debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| + debug_writer_.reset(new AudioDebugFileWriter(params_));
|
|
|
| base::FilePath file_path;
|
| EXPECT_TRUE(base::CreateTemporaryFile(&file_path));
|
| @@ -255,11 +261,11 @@ TEST_P(AudioDebugFileWriterBehavioralTest,
|
| BrowserThread::FILE, FROM_HERE,
|
| base::Bind(&base::WaitableEvent::Wait, base::Owned(wait_for_deletion)));
|
|
|
| - input_debug_writer_->Start(file_path);
|
| + debug_writer_->Start(file_path);
|
|
|
| DoDebugRecording();
|
|
|
| - input_debug_writer_.reset();
|
| + debug_writer_.reset();
|
| wait_for_deletion->Signal();
|
|
|
| WaitForRecordingCompletion();
|
| @@ -275,29 +281,29 @@ TEST_P(AudioDebugFileWriterBehavioralTest,
|
| }
|
|
|
| TEST_P(AudioDebugFileWriterBehavioralTest, FileCreationError) {
|
| - input_debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| + debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| base::FilePath file_path; // Empty file name.
|
| - input_debug_writer_->Start(file_path);
|
| + debug_writer_->Start(file_path);
|
| DoDebugRecording();
|
| }
|
|
|
| TEST_P(AudioDebugFileWriterBehavioralTest, StartStopStartStop) {
|
| - input_debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| + debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| RecordAndVerifyOnce();
|
| RecordAndVerifyOnce();
|
| }
|
|
|
| TEST_P(AudioDebugFileWriterBehavioralTest, DestroyNotStarted) {
|
| - input_debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| - input_debug_writer_.reset();
|
| + debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| + debug_writer_.reset();
|
| }
|
|
|
| TEST_P(AudioDebugFileWriterBehavioralTest, DestroyStarted) {
|
| - input_debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| + debug_writer_.reset(new AudioDebugFileWriter(params_));
|
| base::FilePath file_path;
|
| EXPECT_TRUE(base::CreateTemporaryFile(&file_path));
|
| - input_debug_writer_->Start(file_path);
|
| - input_debug_writer_.reset();
|
| + debug_writer_->Start(file_path);
|
| + debug_writer_.reset();
|
| }
|
|
|
| INSTANTIATE_TEST_CASE_P(
|
|
|