Convert media/formats to std::unique_ptr

media/formats/webm/cluster_builder.cc

Index: media/formats/webm/cluster_builder.cc
diff --git a/media/formats/webm/cluster_builder.cc b/media/formats/webm/cluster_builder.cc
index b3ecc9803ca112881e4fbc482e90f98196598904..4a96beb5af8fd1dc4c92dd3f3a4b18d2e1f1204c 100644
--- a/media/formats/webm/cluster_builder.cc
+++ b/media/formats/webm/cluster_builder.cc
@@ -4,6 +4,7 @@
 
 #include "media/formats/webm/cluster_builder.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/logging.h"
@@ -56,7 +57,7 @@ enum {
   kInitialBufferSize = 32768,
 };
 
-Cluster::Cluster(scoped_ptr<uint8_t[]> data, int size)
+Cluster::Cluster(std::unique_ptr<uint8_t[]> data, int size)
     : data_(std::move(data)), size_(size) {}
 Cluster::~Cluster() {}
 
@@ -186,22 +187,22 @@ void ClusterBuilder::WriteBlock(uint8_t* buf,
   memcpy(buf + 4, data, size);
 }
 
-scoped_ptr<Cluster> ClusterBuilder::Finish() {
+std::unique_ptr<Cluster> ClusterBuilder::Finish() {
   DCHECK_NE(cluster_timecode_, -1);
 
   UpdateUInt64(kClusterSizeOffset, bytes_used_ - (kClusterSizeOffset + 8));
 
-  scoped_ptr<Cluster> ret(new Cluster(std::move(buffer_), bytes_used_));
+  std::unique_ptr<Cluster> ret(new Cluster(std::move(buffer_), bytes_used_));
   Reset();
   return ret;
 }
 
-scoped_ptr<Cluster> ClusterBuilder::FinishWithUnknownSize() {
+std::unique_ptr<Cluster> ClusterBuilder::FinishWithUnknownSize() {
   DCHECK_NE(cluster_timecode_, -1);
 
   UpdateUInt64(kClusterSizeOffset, kWebMUnknownSize);
 
-  scoped_ptr<Cluster> ret(new Cluster(std::move(buffer_), bytes_used_));
+  std::unique_ptr<Cluster> ret(new Cluster(std::move(buffer_), bytes_used_));
   Reset();
   return ret;
 }
@@ -220,7 +221,7 @@ void ClusterBuilder::ExtendBuffer(int bytes_needed) {
   while ((new_buffer_size - bytes_used_) < bytes_needed)
     new_buffer_size *= 2;
 
-  scoped_ptr<uint8_t[]> new_buffer(new uint8_t[new_buffer_size]);
+  std::unique_ptr<uint8_t[]> new_buffer(new uint8_t[new_buffer_size]);
 
   memcpy(new_buffer.get(), buffer_.get(), bytes_used_);
   buffer_.reset(new_buffer.release());