commit 88788adcfd9e84e3e8882806e68d759898be0907
author kwiberg <kwiberg@webrtc.org> Fri Feb 19 07:04:49 2016 -0800
committer Commit bot <commit-bot@chromium.org> Fri Feb 19 15:04:56 2016 +0000
tree 6f7002e6e23d7b2d98a097b51a1cb7e2c4b25525
parent df88460372e7ce78c871a87774d7e6d82aac6ee3

Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/

BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1710483002

Cr-Commit-Position: refs/heads/master@{#11684}

webrtc/modules/audio_processing/audio_processing_impl.h

diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h
index b3f43fa..4a28761 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.h
+++ b/webrtc/modules/audio_processing/audio_processing_impl.h
@@ -12,11 +12,11 @@
 #define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
 
 #include <list>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/criticalsection.h"
-#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/audio_processing/audio_buffer.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
@@ -137,7 +137,7 @@
   // State for the debug dump.
   struct ApmDebugDumpThreadState {
     ApmDebugDumpThreadState() : event_msg(new audioproc::Event()) {}
-    rtc::scoped_ptr<audioproc::Event> event_msg;  // Protobuf message.
+    std::unique_ptr<audioproc::Event> event_msg;  // Protobuf message.
     std::string event_str;  // Memory for protobuf serialization.
 
     // Serialized string of last saved APM configuration.
@@ -149,7 +149,7 @@
     // Number of bytes that can still be written to the log before the maximum
     // size is reached. A value of <= 0 indicates that no limit is used.
     int64_t num_bytes_left_for_log_ = -1;
-    rtc::scoped_ptr<FileWrapper> debug_file;
+    std::unique_ptr<FileWrapper> debug_file;
     ApmDebugDumpThreadState render;
     ApmDebugDumpThreadState capture;
   };
@@ -250,8 +250,8 @@
   rtc::CriticalSection crit_capture_;
 
   // Structs containing the pointers to the submodules.
-  rtc::scoped_ptr<ApmPublicSubmodules> public_submodules_;
-  rtc::scoped_ptr<ApmPrivateSubmodules> private_submodules_
+  std::unique_ptr<ApmPublicSubmodules> public_submodules_;
+  std::unique_ptr<ApmPrivateSubmodules> private_submodules_
       GUARDED_BY(crit_capture_);
 
   // State that is written to while holding both the render and capture locks
@@ -313,7 +313,7 @@
     bool transient_suppressor_enabled;
     std::vector<Point> array_geometry;
     SphericalPointf target_direction;
-    rtc::scoped_ptr<AudioBuffer> capture_audio;
+    std::unique_ptr<AudioBuffer> capture_audio;
     // Only the rate and samples fields of fwd_proc_format_ are used because the
     // forward processing number of channels is mutable and is tracked by the
     // capture_audio_.
@@ -337,8 +337,8 @@
   } capture_nonlocked_;
 
   struct ApmRenderState {
-    rtc::scoped_ptr<AudioConverter> render_converter;
-    rtc::scoped_ptr<AudioBuffer> render_audio;
+    std::unique_ptr<AudioConverter> render_converter;
+    std::unique_ptr<AudioBuffer> render_audio;
   } render_ GUARDED_BY(crit_render_);
 };