Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}.

media/webm/cluster_builder.cc

Index: media/webm/cluster_builder.cc
diff --git a/media/webm/cluster_builder.cc b/media/webm/cluster_builder.cc
index 44c87c87593d56085b8d3b3baad66d182bd2cb68..d0813fc168abc7409f270d9948959961beb648bd 100644
--- a/media/webm/cluster_builder.cc
+++ b/media/webm/cluster_builder.cc
@@ -31,7 +31,8 @@ const int kSimpleBlockSizeOffset = 1;
 
 const int kInitialBufferSize = 32768;
 
-Cluster::Cluster(const uint8* data, int size) : data_(data), size_(size) {}
+Cluster::Cluster(scoped_array<uint8> data, int size)
+    : data_(data.Pass()), size_(size) {}
 Cluster::~Cluster() {}
 
 ClusterBuilder::ClusterBuilder() { Reset(); }
@@ -84,14 +85,14 @@ void ClusterBuilder::AddSimpleBlock(int track_num, int64 timecode, int flags,
   bytes_used_ += bytes_needed;
 }
 
-Cluster* ClusterBuilder::Finish() {
+scoped_ptr<Cluster> ClusterBuilder::Finish() {
   DCHECK_NE(cluster_timecode_, -1);
 
   UpdateUInt64(kClusterSizeOffset, bytes_used_ - (kClusterSizeOffset + 8));
 
-  scoped_ptr<Cluster> ret(new Cluster(buffer_.release(), bytes_used_));
+  scoped_ptr<Cluster> ret(new Cluster(buffer_.Pass(), bytes_used_));
   Reset();
-  return ret.release();
+  return ret.Pass();
 }
 
 void ClusterBuilder::Reset() {