Revert of Forward output glitch information from stream WebRTC log

media/audio/audio_input_controller.cc

Index: media/audio/audio_input_controller.cc
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index fdc821f81516d076b0f4cc79358475a1da59a930..f1216be211757083847ec8b5d4e1d0bc50249522 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -117,7 +117,7 @@
 namespace media {
 
 // static
-AudioInputController::Factory* AudioInputController::factory_ = nullptr;
+AudioInputController::Factory* AudioInputController::factory_ = NULL;
 
 AudioInputController::AudioInputController(EventHandler* handler,
                                            SyncWriter* sync_writer,
@@ -125,7 +125,7 @@
                                            const bool agc_is_enabled)
     : creator_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       handler_(handler),
-      stream_(nullptr),
+      stream_(NULL),
       data_is_active_(false),
       state_(CLOSED),
       sync_writer_(sync_writer),
@@ -156,14 +156,14 @@
   DCHECK(audio_manager);
 
   if (!params.IsValid() || (params.channels() > kMaxInputChannels))
-    return nullptr;
+    return NULL;
 
   if (factory_) {
     return factory_->Create(
         audio_manager, event_handler, params, user_input_monitor);
   }
-  scoped_refptr<AudioInputController> controller(new AudioInputController(
-      event_handler, nullptr, user_input_monitor, false));
+  scoped_refptr<AudioInputController> controller(
+      new AudioInputController(event_handler, NULL, user_input_monitor, false));
 
   controller->task_runner_ = audio_manager->GetTaskRunner();
 
@@ -176,7 +176,7 @@
                      base::Unretained(audio_manager),
                      params,
                      device_id))) {
-    controller = nullptr;
+    controller = NULL;
   }
 
   return controller;
@@ -195,7 +195,7 @@
   DCHECK(sync_writer);
 
   if (!params.IsValid() || (params.channels() > kMaxInputChannels))
-    return nullptr;
+    return NULL;
 
   // Create the AudioInputController object and ensure that it runs on
   // the audio-manager thread.
@@ -212,7 +212,7 @@
                      base::Unretained(audio_manager),
                      params,
                      device_id))) {
-    controller = nullptr;
+    controller = NULL;
   }
 
   return controller;
@@ -244,7 +244,7 @@
           base::Bind(&AudioInputController::DoCreateForStream,
                      controller,
                      stream))) {
-    controller = nullptr;
+    controller = NULL;
   }
 
   return controller;
@@ -288,8 +288,7 @@
   // platform audio input requires the |no_data_timer_| be used to auto-detect
   // errors.  In reality, probably only Windows needs to be treated as
   // unreliable here.
-  DoCreateForStream(audio_manager->MakeAudioInputStream(
-      params, device_id, base::Bind(&AudioInputController::LogMessage, this)));
+  DoCreateForStream(audio_manager->MakeAudioInputStream(params, device_id));
 }
 
 void AudioInputController::DoCreateForLowLatency(AudioManager* audio_manager,
@@ -324,7 +323,7 @@
 
   if (stream_ && !stream_->Open()) {
     stream_->Close();
-    stream_ = nullptr;
+    stream_ = NULL;
     if (handler_)
       handler_->OnError(this, STREAM_OPEN_ERROR);
     LogCaptureStartupResult(CAPTURE_STARTUP_OPEN_STREAM_FAILED);
@@ -669,14 +668,14 @@
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Allow calling unconditionally and bail if we don't have a stream to close.
-  if (stream_ != nullptr) {
+  if (stream_ != NULL) {
     stream_->Stop();
     stream_->Close();
-    stream_ = nullptr;
+    stream_ = NULL;
   }
 
   // The event handler should not be touched after the stream has been closed.
-  handler_ = nullptr;
+  handler_ = NULL;
 }
 
 void AudioInputController::SetDataIsActive(bool enabled) {
@@ -736,9 +735,4 @@
     input_writer_->Write(std::move(data));
 }
 
-void AudioInputController::LogMessage(const std::string& message) {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  handler_->OnLog(this, message);
-}
-
 }  // namespace media