Revert of Reland: Forward output glitch information from stream WebRTC log

media/audio/mac/audio_auhal_mac_unittest.cc

 // Copyright 2013 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/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_message_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_unittest_util.h"
 #include "media/audio/mock_audio_source_callback.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::Return;
 
 // TODO(crogers): Most of these tests can be made platform agnostic.
 // http://crbug.com/223242
 
 namespace media {
 
 ACTION(ZeroBuffer) {
   arg0->Zero();
 }
 
-ACTION_P3(MaybeSignalEvent, counter, signal_at_count, event) {
-  if (++(*counter) == signal_at_count)
-    event->Signal();
+ACTION_P(SignalEvent, event) {
+  event->Signal();
 }
 
 class AUHALStreamTest : public testing::Test {
  public:
   AUHALStreamTest()
       : message_loop_(base::MessageLoop::TYPE_UI),
         manager_(AudioManager::CreateForTesting(
             base::ThreadTaskRunnerHandle::Get())) {
     // Wait for the AudioManager to finish any initialization on the audio loop.
     base::RunLoop().RunUntilIdle();
   }
 
   ~AUHALStreamTest() override {}
 
   AudioOutputStream* Create() {
     return manager_->MakeAudioOutputStream(
-        manager_->GetDefaultOutputStreamParameters(), "",
-        base::Bind(&AUHALStreamTest::OnLogMessage, base::Unretained(this)));
+        manager_->GetDefaultOutputStreamParameters(), "");
   }
 
   bool OutputDevicesAvailable() {
     return manager_->HasAudioOutputDevices();
   }
 
-  void OnLogMessage(const std::string& message) { log_message_ = message; }
-
  protected:
   base::TestMessageLoop message_loop_;
   ScopedAudioManagerPtr manager_;
   MockAudioSourceCallback source_;
-  std::string log_message_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AUHALStreamTest);
 };
 
 TEST_F(AUHALStreamTest, HardwareSampleRate) {
   ABORT_AUDIO_TEST_IF_NOT(OutputDevicesAvailable());
   const AudioParameters preferred_params =
       manager_->GetDefaultOutputStreamParameters();
   EXPECT_GE(preferred_params.sample_rate(), 16000);
@@ skipping 11 matching lines @@
   EXPECT_TRUE(stream->Open());
   stream->Close();
 }
 
 TEST_F(AUHALStreamTest, CreateOpenStartStopClose) {
   ABORT_AUDIO_TEST_IF_NOT(OutputDevicesAvailable());
 
   AudioOutputStream* stream = Create();
   EXPECT_TRUE(stream->Open());
 
-  // Wait for the first two data callback from the OS.
+  // Wait for the first data callback from the OS.
   base::WaitableEvent event(false, false);
-  int callback_counter = 0;
-  const int number_of_callbacks = 2;
   EXPECT_CALL(source_, OnMoreData(_, _, _))
-      .Times(number_of_callbacks)
-      .WillRepeatedly(DoAll(
-          ZeroBuffer(),
-          MaybeSignalEvent(&callback_counter, number_of_callbacks, &event),
-          Return(0)));
+      .WillOnce(DoAll(ZeroBuffer(), SignalEvent(&event), Return(0)));
   EXPECT_CALL(source_, OnError(_)).Times(0);
   stream->Start(&source_);
   event.Wait();
 
   stream->Stop();
   stream->Close();
-
-  EXPECT_FALSE(log_message_.empty());
 }
 
 }  // namespace media