Remove unused file_thread_ from AudioDebugFileWriter unit tests.

AudioDebugFileWriter's constructor no longer takes a file thread as parameter since [1].
Remove file thread from unit tests.

[1] https://chromium.googlesource.com/chromium/src/+/4d7742ed008b3b749a757d52f75133dfd5d7f44c

Bug: 689520
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I0d824f83818893750775ad4e1b80443e2dcd2c2d
Reviewed-on: https://chromium-review.googlesource.com/827129
Commit-Queue: Marina Ciocea <marinaciocea@chromium.org>
Reviewed-by: Max Morin <maxmorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524378}

media/audio/audio_debug_file_writer_unittest.cc

@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include <stdint.h>
+#include <limits>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ -45,8 +47,11 @@ typedef std::tr1::tuple<ChannelLayout, int, int, int>
 class AudioDebugFileWriterTest
     : public testing::TestWithParam<AudioDebugFileWriterTestData> {
  public:
-  AudioDebugFileWriterTest()
-      : file_thread_("FileThread"),
+  explicit AudioDebugFileWriterTest(
+      base::test::ScopedTaskEnvironment::ExecutionMode execution_mode)
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
+            execution_mode),
         params_(AudioParameters::Format::AUDIO_PCM_LINEAR,
                 std::tr1::get<0>(GetParam()),
                 std::tr1::get<1>(GetParam()),
@@ -57,9 +62,11 @@ class AudioDebugFileWriterTest
                         writes_),
         source_interleaved_(source_samples_ ? new int16_t[source_samples_]
                                             : nullptr) {
-    file_thread_.StartAndWaitForTesting();
     InitSourceInterleaved(source_interleaved_.get(), source_samples_);
   }
+  AudioDebugFileWriterTest()
+      : AudioDebugFileWriterTest(
+            base::test::ScopedTaskEnvironment::ExecutionMode::ASYNC) {}
 
  protected:
   virtual ~AudioDebugFileWriterTest() = default;
@@ -158,7 +165,6 @@ class AudioDebugFileWriterTest
   }
 
   void DoDebugRecording() {
-    // Write tasks are posted to |file_thread_|.
     for (int i = 0; i < writes_; ++i) {
       std::unique_ptr<AudioBus> bus =
           AudioBus::Create(params_.channels(), params_.frames_per_buffer());
@@ -195,11 +201,6 @@ class AudioDebugFileWriterTest
   }
 
  protected:
-  // |file_thread_| must to be declared before |debug_writer_| so that it's
-  // destroyed after. This ensures all tasks posted in |debug_writer_| to the
-  // file thread are run before exiting the test.
-  base::Thread file_thread_;
-
   // The test task environment.
   base::test::ScopedTaskEnvironment scoped_task_environment_;
 
@@ -224,6 +225,13 @@ class AudioDebugFileWriterTest
 
 class AudioDebugFileWriterBehavioralTest : public AudioDebugFileWriterTest {};
 
+class AudioDebugFileWriterSingleThreadTest : public AudioDebugFileWriterTest {
+ public:
+  AudioDebugFileWriterSingleThreadTest()
+      : AudioDebugFileWriterTest(
+            base::test::ScopedTaskEnvironment::ExecutionMode::QUEUED) {}
+};
+
 TEST_P(AudioDebugFileWriterTest, WaveRecordingTest) {
   debug_writer_.reset(new AudioDebugFileWriter(params_));
   RecordAndVerifyOnce();
@@ -235,27 +243,18 @@ TEST_P(AudioDebugFileWriterTest, GetFileNameExtension) {
             base::FilePath::StringType(debug_writer_->GetFileNameExtension()));
 }
 
-TEST_P(AudioDebugFileWriterBehavioralTest,
+TEST_P(AudioDebugFileWriterSingleThreadTest,
        DeletedBeforeRecordingFinishedOnFileThread) {
   debug_writer_.reset(new AudioDebugFileWriter(params_));
 
   base::FilePath file_path;
   EXPECT_TRUE(base::CreateTemporaryFile(&file_path));
 
-  base::WaitableEvent* wait_for_deletion =
-      new base::WaitableEvent(base::WaitableEvent::ResetPolicy::MANUAL,
-                              base::WaitableEvent::InitialState::NOT_SIGNALED);
-
-  file_thread_.task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&base::WaitableEvent::Wait, base::Owned(wait_for_deletion)));
-
   debug_writer_->Start(file_path);
 
   DoDebugRecording();
 
   debug_writer_.reset();
-  wait_for_deletion->Signal();
 
   scoped_task_environment_.RunUntilIdle();
 
@@ -342,4 +341,14 @@ INSTANTIATE_TEST_CASE_P(
                              44100 / 100,
                              100)));
 
+INSTANTIATE_TEST_CASE_P(
+    AudioDebugFileWriterSingleThreadTest,
+    AudioDebugFileWriterSingleThreadTest,
+    // Using 10ms frames per buffer everywhere.
+    testing::Values(
+        // No writes.
+        std::tr1::make_tuple(ChannelLayout::CHANNEL_LAYOUT_MONO,
+                             44100,
+                             44100 / 100,
+                             100)));
 }  // namespace media