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

media/webm/cluster_builder.h

Index: media/webm/cluster_builder.h
diff --git a/media/webm/cluster_builder.h b/media/webm/cluster_builder.h
index 132da8a23613fc57963a075f154a759d691a599f..f4bff55db139288f747a988e6b2714105d368db5 100644
--- a/media/webm/cluster_builder.h
+++ b/media/webm/cluster_builder.h
@@ -13,15 +13,14 @@ namespace media {
 
 class Cluster {
  public:
-  // Takes ownership of |data|
-  Cluster(const uint8* data, int size);
+  Cluster(scoped_array<uint8> data, int size);
   ~Cluster();
 
   const uint8* data() const { return data_.get(); }
   int size() const { return size_; }
 
  private:
-  scoped_array<const uint8> data_;
+  scoped_array<uint8> data_;
   int size_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(Cluster);
@@ -36,7 +35,7 @@ class ClusterBuilder {
   void AddSimpleBlock(int track_num, int64 timecode, int flags,
                       const uint8* data, int size);
 
-  Cluster* Finish();
+  scoped_ptr<Cluster> Finish();
 
  private:
   void Reset();