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

Unified Diff: media/audio/audio_output_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_manager_unittest.cc ('k') | media/audio/audio_output_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_controller.h
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
index 58e1e458a97e1ec06b5157706a62940919b7d2cc..1f5c358ae3cedc04cc4ca90ea3aeb468ff7b335f 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -7,6 +7,8 @@
#include <stdint.h>
+#include <memory>
+
#include "base/atomic_ref_count.h"
#include "base/callback.h"
#include "base/macros.h"
@@ -256,7 +258,7 @@ class MEDIA_EXPORT AudioOutputController
// Flags when we've asked for a stream to start but it never did.
base::AtomicRefCount on_more_io_data_called_;
- scoped_ptr<base::OneShotTimer> wedge_timer_;
+ std::unique_ptr<base::OneShotTimer> wedge_timer_;
// Flag which indicates errors received during Stop/Close should be ignored.
// These errors are generally harmless since a fresh stream is about to be
« no previous file with comments | « media/audio/audio_manager_unittest.cc ('k') | media/audio/audio_output_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698