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

media/webm/cluster_builder.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/webm/cluster_builder.h"
 
 #include "base/logging.h"
 #include "media/base/data_buffer.h"
 
 namespace media {
@@ skipping 13 matching lines @@
 static const uint8 kSimpleBlockHeader[] = {
   0xA3,  // SimpleBlock ID
   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // SimpleBlock(size = 0)
 };
 
 const int kSimpleBlockHeaderSize = sizeof(kSimpleBlockHeader);
 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(); }
 ClusterBuilder::~ClusterBuilder() {}
 
 void ClusterBuilder::SetClusterTimecode(int64 cluster_timecode) {
   DCHECK_EQ(cluster_timecode_, -1);
 
   cluster_timecode_ = cluster_timecode;
 
@@ skipping 32 matching lines @@
 
   buf[0] = 0x80 | (track_num & 0x7F);
   buf[1] = (timecode_delta >> 8) & 0xff;
   buf[2] = timecode_delta & 0xff;
   buf[3] = flags & 0xff;
   memcpy(buf + 4, data, size);
 
   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() {
   buffer_size_ = kInitialBufferSize;
   buffer_.reset(new uint8[buffer_size_]);
   memcpy(buffer_.get(), kClusterHeader, kClusterHeaderSize);
   bytes_used_ = kClusterHeaderSize;
   cluster_timecode_ = -1;
 }
 
@@ skipping 15 matching lines @@
   uint8* buf = buffer_.get() + offset;
 
   // Fill the last 7 bytes of size field in big-endian order.
   for (int i = 7; i > 0; i--) {
     buf[i] = value & 0xff;
     value >>= 8;
   }
 }
 
 }  // namespace media