| Index: media/formats/webm/cluster_builder.h
|
| diff --git a/media/formats/webm/cluster_builder.h b/media/formats/webm/cluster_builder.h
|
| index c05789e0ae7fdb8c8c7b59713733ae3a5dfb12d2..07c2d7a83e6da7a80eff3dea476acd3502778ebd 100644
|
| --- a/media/formats/webm/cluster_builder.h
|
| +++ b/media/formats/webm/cluster_builder.h
|
| @@ -7,21 +7,22 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace media {
|
|
|
| class Cluster {
|
| public:
|
| - Cluster(scoped_ptr<uint8_t[]> data, int size);
|
| + Cluster(std::unique_ptr<uint8_t[]> data, int size);
|
| ~Cluster();
|
|
|
| const uint8_t* data() const { return data_.get(); }
|
| int size() const { return size_; }
|
|
|
| private:
|
| - scoped_ptr<uint8_t[]> data_;
|
| + std::unique_ptr<uint8_t[]> data_;
|
| int size_;
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(Cluster);
|
| @@ -50,8 +51,8 @@ class ClusterBuilder {
|
| const uint8_t* data,
|
| int size);
|
|
|
| - scoped_ptr<Cluster> Finish();
|
| - scoped_ptr<Cluster> FinishWithUnknownSize();
|
| + std::unique_ptr<Cluster> Finish();
|
| + std::unique_ptr<Cluster> FinishWithUnknownSize();
|
|
|
| private:
|
| void AddBlockGroupInternal(int track_num,
|
| @@ -71,7 +72,7 @@ class ClusterBuilder {
|
| const uint8_t* data,
|
| int size);
|
|
|
| - scoped_ptr<uint8_t[]> buffer_;
|
| + std::unique_ptr<uint8_t[]> buffer_;
|
| int buffer_size_;
|
| int bytes_used_;
|
| int64_t cluster_timecode_;
|
|
|