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

Unified Diff: media/renderers/mock_gpu_video_accelerator_factories.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
Index: media/renderers/mock_gpu_video_accelerator_factories.h
diff --git a/media/renderers/mock_gpu_video_accelerator_factories.h b/media/renderers/mock_gpu_video_accelerator_factories.h
index 6fe96466d49d70c09e4250db768eb5e2d5db4d6b..3db81dc7186fed2590890125f54e5acf50494601 100644
--- a/media/renderers/mock_gpu_video_accelerator_factories.h
+++ b/media/renderers/mock_gpu_video_accelerator_factories.h
@@ -8,9 +8,10 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/single_thread_task_runner.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
#include "media/video/video_decode_accelerator.h"
@@ -48,7 +49,7 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
MOCK_METHOD0(GetVideoEncodeAcceleratorSupportedProfiles,
VideoEncodeAccelerator::SupportedProfiles());
- scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
+ std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
const gfx::Size& size,
gfx::BufferFormat format,
gfx::BufferUsage usage) override;
@@ -59,7 +60,7 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
return video_frame_output_format_;
};
- scoped_ptr<GpuVideoAcceleratorFactories::ScopedGLContextLock>
+ std::unique_ptr<GpuVideoAcceleratorFactories::ScopedGLContextLock>
GetGLContextLock() override;
void SetVideoFrameOutputFormat(
@@ -73,11 +74,13 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
void SetGpuMemoryBuffersInUseByMacOSWindowServer(bool in_use);
- scoped_ptr<base::SharedMemory> CreateSharedMemory(size_t size) override;
+ std::unique_ptr<base::SharedMemory> CreateSharedMemory(size_t size) override;
- scoped_ptr<VideoDecodeAccelerator> CreateVideoDecodeAccelerator() override;
+ std::unique_ptr<VideoDecodeAccelerator> CreateVideoDecodeAccelerator()
+ override;
- scoped_ptr<VideoEncodeAccelerator> CreateVideoEncodeAccelerator() override;
+ std::unique_ptr<VideoEncodeAccelerator> CreateVideoEncodeAccelerator()
+ override;
gpu::gles2::GLES2Interface* GetGLES2Interface() { return gles2_; }
« no previous file with comments | « media/renderers/gpu_video_accelerator_factories.h ('k') | media/renderers/mock_gpu_video_accelerator_factories.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698