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

Unified Diff: media/audio/win/audio_low_latency_output_win.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: Fix cast + windows build 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
Index: media/audio/win/audio_low_latency_output_win.h
diff --git a/media/audio/win/audio_low_latency_output_win.h b/media/audio/win/audio_low_latency_output_win.h
index c62a44cec94728bb64992277d2ccacd27fdc935b..366b445967b453788b539c3fcd7afc155a82fad0 100644
--- a/media/audio/win/audio_low_latency_output_win.h
+++ b/media/audio/win/audio_low_latency_output_win.h
@@ -98,11 +98,11 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/platform_thread.h"
#include "base/threading/simple_thread.h"
#include "base/win/scoped_co_mem.h"
@@ -183,7 +183,7 @@ class MEDIA_EXPORT WASAPIAudioOutputStream :
// Rendering is driven by this thread (which has no message loop).
// All OnMoreData() callbacks will be called from this thread.
- scoped_ptr<base::DelegateSimpleThread> render_thread_;
+ std::unique_ptr<base::DelegateSimpleThread> render_thread_;
// Contains the desired audio format which is set up at construction.
// Extended PCM waveform format structure based on WAVEFORMATEXTENSIBLE.
@@ -240,7 +240,7 @@ class MEDIA_EXPORT WASAPIAudioOutputStream :
base::win::ScopedHandle stop_render_event_;
// Container for retrieving data from AudioSourceCallback::OnMoreData().
- scoped_ptr<AudioBus> audio_bus_;
+ std::unique_ptr<AudioBus> audio_bus_;
base::win::ScopedComPtr<IAudioClock> audio_clock_;

Powered by Google App Engine
This is Rietveld 408576698