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

Side by Side Diff: media/cdm/simple_cdm_allocator.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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CDM_SIMPLE_CDM_ALLOCATOR_H_ 5 #ifndef MEDIA_CDM_SIMPLE_CDM_ALLOCATOR_H_
6 #define MEDIA_CDM_SIMPLE_CDM_ALLOCATOR_H_ 6 #define MEDIA_CDM_SIMPLE_CDM_ALLOCATOR_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <memory>
10 11
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "media/cdm/cdm_allocator.h" 13 #include "media/cdm/cdm_allocator.h"
13 14
14 namespace media { 15 namespace media {
15 16
16 // This is a simple CdmAllocator for testing. 17 // This is a simple CdmAllocator for testing.
17 class SimpleCdmAllocator : public CdmAllocator { 18 class SimpleCdmAllocator : public CdmAllocator {
18 public: 19 public:
19 SimpleCdmAllocator(); 20 SimpleCdmAllocator();
20 ~SimpleCdmAllocator() final; 21 ~SimpleCdmAllocator() final;
21 22
22 // CdmAllocator implementation. 23 // CdmAllocator implementation.
23 cdm::Buffer* CreateCdmBuffer(size_t capacity) final; 24 cdm::Buffer* CreateCdmBuffer(size_t capacity) final;
24 scoped_ptr<VideoFrameImpl> CreateCdmVideoFrame() final; 25 std::unique_ptr<VideoFrameImpl> CreateCdmVideoFrame() final;
25 26
26 private: 27 private:
27 DISALLOW_COPY_AND_ASSIGN(SimpleCdmAllocator); 28 DISALLOW_COPY_AND_ASSIGN(SimpleCdmAllocator);
28 }; 29 };
29 30
30 } // namespace media 31 } // namespace media
31 32
32 #endif // MEDIA_CDM_SIMPLE_CDM_ALLOCATOR_H_ 33 #endif // MEDIA_CDM_SIMPLE_CDM_ALLOCATOR_H_
OLDNEW
« no previous file with comments | « media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.cc ('k') | media/cdm/simple_cdm_allocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698