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

Unified Diff: media/renderers/renderer_impl.h

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase 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/renderers/mock_gpu_video_accelerator_factories.cc ('k') | media/renderers/renderer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/renderer_impl.h
diff --git a/media/renderers/renderer_impl.h b/media/renderers/renderer_impl.h
index fc17f6cbdf628ee1534e49890275856f156e6300..ba33103386d9549868b44fb57c3ab0bfd800c859 100644
--- a/media/renderers/renderer_impl.h
+++ b/media/renderers/renderer_impl.h
@@ -5,12 +5,12 @@
#ifndef MEDIA_RENDERERS_RENDERER_IMPL_H_
#define MEDIA_RENDERERS_RENDERER_IMPL_H_
+#include <memory>
#include <vector>
#include "base/cancelable_callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
#include "base/time/clock.h"
@@ -41,8 +41,8 @@ class MEDIA_EXPORT RendererImpl : public Renderer {
// GetMediaTime() runs on the render main thread because it's part of JS sync
// API.
RendererImpl(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
- scoped_ptr<AudioRenderer> audio_renderer,
- scoped_ptr<VideoRenderer> video_renderer);
+ std::unique_ptr<AudioRenderer> audio_renderer,
+ std::unique_ptr<VideoRenderer> video_renderer);
~RendererImpl() final;
@@ -148,12 +148,12 @@ class MEDIA_EXPORT RendererImpl : public Renderer {
PipelineStatusCB init_cb_;
base::Closure flush_cb_;
- scoped_ptr<AudioRenderer> audio_renderer_;
- scoped_ptr<VideoRenderer> video_renderer_;
+ std::unique_ptr<AudioRenderer> audio_renderer_;
+ std::unique_ptr<VideoRenderer> video_renderer_;
// Renderer-provided time source used to control playback.
TimeSource* time_source_;
- scoped_ptr<WallClockTimeSource> wall_clock_time_source_;
+ std::unique_ptr<WallClockTimeSource> wall_clock_time_source_;
bool time_ticking_;
double playback_rate_;
« no previous file with comments | « media/renderers/mock_gpu_video_accelerator_factories.cc ('k') | media/renderers/renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698