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

media/filters/chunk_demuxer.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.
 
 // Implements a Demuxer that can switch among different data sources mid-stream.
 // Uses FFmpegDemuxer under the covers, so see the caveats at the top of
 // ffmpeg_demuxer.h.
 
 #include "media/filters/chunk_demuxer.h"
 
@@ skipping 38 matching lines @@
 
 // Offset of the segment size field in kWebMHeader. Used to update
 // the segment size field before handing the buffer to FFmpeg.
 static const int kSegmentSizeOffset = sizeof(kWebMHeader) - 8;
 
 static const uint8 kEmptyCluster[] = {
   0x1F, 0x43, 0xB6, 0x75, 0x80  // CLUSTER (size = 0)
 };
 
 // Create an "end of stream" buffer.
-static Buffer* CreateEOSBuffer() { return new DataBuffer(0, 0); }
+static Buffer* CreateEOSBuffer() {
+  return new DataBuffer(scoped_array<uint8>(0), 0);

[acolwell GONE FROM CHROMIUM, 2012/01/03 22:46:40]

nit: 0 not necessary in constructor.

[Ami GONE FROM CHROMIUM, 2012/01/03 22:52:02]

Actually, scoped_array<uint8>(0) is not necessary.

+}
 
 class ChunkDemuxerStream : public DemuxerStream {
  public:
   typedef std::deque<scoped_refptr<Buffer> > BufferQueue;
   typedef std::deque<ReadCallback> ReadCBQueue;
 
   ChunkDemuxerStream(Type type, AVStream* stream);
   virtual ~ChunkDemuxerStream();
 
   void Flush();
@@ skipping 744 matching lines @@
     base::AutoUnlock auto_unlock(lock_);
     if (cb.is_null()) {
       host()->OnDemuxerError(error);
       return;
     }
     cb.Run(error);
   }
 }
 
 }  // namespace media