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

media/audio/mac/audio_manager_mac.cc

 // Copyright (c) 2012 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 "media/audio/mac/audio_manager_mac.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 580 matching lines @@
        iter != associated_devices.end(); ++iter) {
     if (default_device == *iter)
       return *iter;
   }
 
   // Failed to figure out which is the matching device, return an empty string.
   return std::string();
 }
 
 AudioOutputStream* AudioManagerMac::MakeLinearOutputStream(
-    const AudioParameters& params,
-    const LogCallback& log_callback) {
+    const AudioParameters& params) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
-  return MakeLowLatencyOutputStream(params, std::string(), log_callback);
+  return MakeLowLatencyOutputStream(params, std::string());
 }
 
 AudioOutputStream* AudioManagerMac::MakeLowLatencyOutputStream(
     const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
+    const std::string& device_id) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
   bool device_listener_first_init = false;
   // Lazily create the audio device listener on the first stream creation,
   // even if getting an audio device fails. Otherwise, if we have 0 audio
   // devices, the listener will never be initialized, and new valid devices
   // will never be detected.
   if (!output_device_listener_) {
     // NOTE: Use BindToCurrentLoop() to ensure the callback is always PostTask'd
     // even if OSX calls us on the right thread.  Some CoreAudio drivers will
     // fire the callbacks during stream creation, leading to re-entrancy issues
@@ skipping 14 matching lines @@
   // listener.
   if (device_listener_first_init) {
     // Only set the current output device for the default device.
     if (AudioDeviceDescription::IsDefaultDevice(device_id))
       current_output_device_ = device;
     // Just use the current sample rate since we don't allow non-native sample
     // rates on OSX.
     current_sample_rate_ = params.sample_rate();
   }
 
-  AUHALStream* stream = new AUHALStream(this, params, device, log_callback);
+  AUHALStream* stream = new AUHALStream(this, params, device);
   output_streams_.push_back(stream);
   return stream;
 }
 
 std::string AudioManagerMac::GetDefaultOutputDeviceID() {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
   AudioDeviceID device_id = kAudioObjectUnknown;
   if (!GetDefaultOutputDevice(&device_id))
     return std::string();
 
@@ skipping 13 matching lines @@
   if (status != kAudioHardwareNoError || !device_uid)
     return std::string();
 
   std::string ret(base::SysCFStringRefToUTF8(device_uid));
   CFRelease(device_uid);
 
   return ret;
 }
 
 AudioInputStream* AudioManagerMac::MakeLinearInputStream(
-    const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
+    const AudioParameters& params, const std::string& device_id) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   AudioInputStream* stream = new PCMQueueInAudioInputStream(this, params);
   basic_input_streams_.push_back(stream);
   return stream;
 }
 
 AudioInputStream* AudioManagerMac::MakeLowLatencyInputStream(
-    const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
+    const AudioParameters& params, const std::string& device_id) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
   // Gets the AudioDeviceID that refers to the AudioInputDevice with the device
   // unique id. This AudioDeviceID is used to set the device for Audio Unit.
   AudioDeviceID audio_device_id = GetAudioDeviceIdByUId(true, device_id);
   AUAudioInputStream* stream = NULL;
   if (audio_device_id != kAudioObjectUnknown) {
-    stream =
-        new AUAudioInputStream(this, params, audio_device_id, log_callback);
+    stream = new AUAudioInputStream(this, params, audio_device_id);
     low_latency_input_streams_.push_back(stream);
   }
 
   return stream;
 }
 
 AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
     const std::string& output_device_id,
     const AudioParameters& input_params) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
@@ skipping 354 matching lines @@
 ScopedAudioManagerPtr CreateAudioManager(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
     AudioLogFactory* audio_log_factory) {
   return ScopedAudioManagerPtr(
       new AudioManagerMac(std::move(task_runner), std::move(worker_task_runner),
                           audio_log_factory));
 }
 
 }  // namespace media