Implementation of new AecDump interface.

webrtc/modules/audio_processing/audio_processing_impl.cc

Index: webrtc/modules/audio_processing/audio_processing_impl.cc
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index c87257db9b52175b126159b2fbd01f3ee13d6d56..8ac40e904e6fea942ab7c68c76b0ffece2b8c2c1 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -843,7 +843,7 @@ int AudioProcessingImpl::ProcessStream(const float* const* src,
   }
 #endif
 
-  std::unique_ptr<AecDump::CaptureStreamInfo> stream_info;
+  AecDump::CaptureStreamInfo* stream_info;
   if (aec_dump_) {
     stream_info = RecordUnprocessedCaptureStream(src);
   }
@@ -866,7 +866,7 @@ int AudioProcessingImpl::ProcessStream(const float* const* src,
   }
 #endif
   if (aec_dump_) {
-    RecordProcessedCaptureStream(dest, std::move(stream_info));
+    RecordProcessedCaptureStream(dest, stream_info);
   }
   return kNoError;
 }
@@ -1104,7 +1104,7 @@ int AudioProcessingImpl::ProcessStream(AudioFrame* frame) {
     return kBadDataLengthError;
   }
 
-  std::unique_ptr<AecDump::CaptureStreamInfo> stream_info;
+  AecDump::CaptureStreamInfo* stream_info;
   if (aec_dump_) {
     stream_info = RecordUnprocessedCaptureStream(*frame);
   }
@@ -1127,7 +1127,7 @@ int AudioProcessingImpl::ProcessStream(AudioFrame* frame) {
       frame, submodule_states_.CaptureMultiBandProcessingActive());
 
   if (aec_dump_) {
-    RecordProcessedCaptureStream(*frame, std::move(stream_info));
+    RecordProcessedCaptureStream(*frame, stream_info);
   }
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
   if (debug_dump_.debug_file->is_open()) {
@@ -1954,37 +1954,35 @@ InternalAPMConfig AudioProcessingImpl::CollectApmConfig() const {
   return apm_config;
 }
 
-std::unique_ptr<AecDump::CaptureStreamInfo>
-AudioProcessingImpl::RecordUnprocessedCaptureStream(
+AecDump::CaptureStreamInfo* AudioProcessingImpl::RecordUnprocessedCaptureStream(
     const float* const* src) const {
   RTC_DCHECK(aec_dump_);
   aec_dump_->WriteConfig(CollectApmConfig(), false);
-  auto stream_info = aec_dump_->CreateCaptureStreamInfo();
+  auto* stream_info = aec_dump_->GetCaptureStreamInfo();
   RTC_DCHECK(stream_info);
 
   const size_t channel_size = formats_.api_format.input_stream().num_frames();
   const size_t num_channels = formats_.api_format.input_stream().num_channels();
   stream_info->AddInput(FloatAudioFrame(src, num_channels, channel_size));
-  PopulateStreamInfoWithState(stream_info.get());
+  PopulateStreamInfoWithState(stream_info);
   return stream_info;
 }
 
-std::unique_ptr<AecDump::CaptureStreamInfo>
-AudioProcessingImpl::RecordUnprocessedCaptureStream(
+AecDump::CaptureStreamInfo* AudioProcessingImpl::RecordUnprocessedCaptureStream(
     const AudioFrame& capture_frame) const {
   RTC_DCHECK(aec_dump_);
-  auto stream_info = aec_dump_->CreateCaptureStreamInfo();
+  auto* stream_info = aec_dump_->GetCaptureStreamInfo();
   RTC_DCHECK(stream_info);
 
   stream_info->AddInput(capture_frame);
-  PopulateStreamInfoWithState(stream_info.get());
+  PopulateStreamInfoWithState(stream_info);
   aec_dump_->WriteConfig(CollectApmConfig(), false);
   return stream_info;
 }
 
 void AudioProcessingImpl::RecordProcessedCaptureStream(
     const float* const* processed_capture_stream,
-    std::unique_ptr<AecDump::CaptureStreamInfo> stream_info) const {
+    AecDump::CaptureStreamInfo* stream_info) const {
   RTC_DCHECK(stream_info);
   RTC_DCHECK(aec_dump_);
 
@@ -1993,17 +1991,17 @@ void AudioProcessingImpl::RecordProcessedCaptureStream(
       formats_.api_format.output_stream().num_channels();
   stream_info->AddOutput(
       FloatAudioFrame(processed_capture_stream, num_channels, channel_size));
-  aec_dump_->WriteCaptureStreamMessage(std::move(stream_info));
+  aec_dump_->WriteCaptureStreamMessage();
 }
 
 void AudioProcessingImpl::RecordProcessedCaptureStream(
     const AudioFrame& processed_capture_frame,
-    std::unique_ptr<AecDump::CaptureStreamInfo> stream_info) const {
+    AecDump::CaptureStreamInfo* stream_info) const {
   RTC_DCHECK(stream_info);
   RTC_DCHECK(aec_dump_);
 
   stream_info->AddOutput(processed_capture_frame);
-  aec_dump_->WriteCaptureStreamMessage(std::move(stream_info));
+  aec_dump_->WriteCaptureStreamMessage();
 }
 
 void AudioProcessingImpl::PopulateStreamInfoWithState(