Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(574)

Unified Diff: media/audio/audio_input_controller.h

Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_device_thread.h ('k') | media/audio/audio_input_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_input_controller.h
diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
index 0aa87046f0efbbc84efdf9598e4340d35309d7be..00c3ceeb72ee133c3dd95f81968814924094eb54 100644
--- a/media/audio/audio_input_controller.h
+++ b/media/audio/audio_input_controller.h
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/atomicops.h"
@@ -15,7 +16,6 @@
#include "base/files/file.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
@@ -292,7 +292,7 @@ class MEDIA_EXPORT AudioInputController
void DoClose();
void DoReportError();
void DoSetVolume(double volume);
- void DoOnData(scoped_ptr<AudioBus> data);
+ void DoOnData(std::unique_ptr<AudioBus> data);
void DoLogAudioLevels(float level_dbfs, int microphone_volume_percent);
// Method to check if we get recorded data after a stream was started,
@@ -324,7 +324,7 @@ class MEDIA_EXPORT AudioInputController
void DoDisableDebugRecording();
// Called on the audio thread.
- void WriteInputDataForDebugging(scoped_ptr<AudioBus> data);
+ void WriteInputDataForDebugging(std::unique_ptr<AudioBus> data);
// Gives access to the task runner of the creating thread.
scoped_refptr<base::SingleThreadTaskRunner> creator_task_runner_;
@@ -344,7 +344,7 @@ class MEDIA_EXPORT AudioInputController
// whilst recording on Windows.
// See http://crbug.com/79936 for details.
// This member is only touched by the audio thread.
- scoped_ptr<base::Timer> no_data_timer_;
+ std::unique_ptr<base::Timer> no_data_timer_;
// This flag is used to signal that we are receiving OnData() calls, i.e,
// that data is active. It can be touched by the audio thread and by the
« no previous file with comments | « media/audio/audio_device_thread.h ('k') | media/audio/audio_input_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698