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

media/base/media_log.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/base/media_log.h"
 
 #include <string>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
@@ skipping 132 matching lines @@
   return NULL;
 }
 
 MediaLog::MediaLog() {
   id_ = media_log_count.GetNext();
   stats_update_pending_ = false;
 }
 
 MediaLog::~MediaLog() {}
 
-void MediaLog::AddEvent(MediaLogEvent* event) {
-  scoped_ptr<MediaLogEvent> e(event);
+void MediaLog::AddEvent(scoped_ptr<MediaLogEvent> event) {
 }
 
-MediaLogEvent* MediaLog::CreateEvent(MediaLogEvent::Type type) {
+scoped_ptr<MediaLogEvent> MediaLog::CreateEvent(MediaLogEvent::Type type) {
   scoped_ptr<MediaLogEvent> event(new MediaLogEvent);
   event->id = id_;
   event->type = type;
   event->time = base::Time::Now();
-  return event.release();
+  return event.Pass();
 }
 
-MediaLogEvent* MediaLog::CreateBooleanEvent(MediaLogEvent::Type type,
-                                            const char* property, bool value) {
+scoped_ptr<MediaLogEvent> MediaLog::CreateBooleanEvent(
+    MediaLogEvent::Type type, const char* property, bool value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(type));
   event->params.SetBoolean(property, value);
-  return event.release();
+  return event.Pass();
 }
 
-MediaLogEvent* MediaLog::CreateIntegerEvent(MediaLogEvent::Type type,
-                                            const char* property, int64 value) {
+scoped_ptr<MediaLogEvent> MediaLog::CreateIntegerEvent(
+    MediaLogEvent::Type type, const char* property, int64 value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(type));
   event->params.SetInteger(property, value);
-  return event.release();
+  return event.Pass();
 }
 
-MediaLogEvent* MediaLog::CreateTimeEvent(MediaLogEvent::Type type,
-                                         const char* property,
-                                         base::TimeDelta value) {
+scoped_ptr<MediaLogEvent> MediaLog::CreateTimeEvent(
+    MediaLogEvent::Type type, const char* property, base::TimeDelta value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(type));
   event->params.SetDouble(property, value.InSecondsF());
-  return event.release();
+  return event.Pass();
 }
 
-MediaLogEvent* MediaLog::CreateLoadEvent(const std::string& url) {
+scoped_ptr<MediaLogEvent> MediaLog::CreateLoadEvent(const std::string& url) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::LOAD));
   event->params.SetString("url", url);
-  return event.release();
+  return event.Pass();
 }
 
-MediaLogEvent* MediaLog::CreateSeekEvent(float seconds) {
+scoped_ptr<MediaLogEvent> MediaLog::CreateSeekEvent(float seconds) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::SEEK));
   event->params.SetDouble("seek_target", seconds);
-  return event.release();
+  return event.Pass();
 }
 
-MediaLogEvent* MediaLog::CreatePipelineStateChangedEvent(
+scoped_ptr<MediaLogEvent> MediaLog::CreatePipelineStateChangedEvent(
     PipelineImpl::State state) {
   scoped_ptr<MediaLogEvent> event(
       CreateEvent(MediaLogEvent::PIPELINE_STATE_CHANGED));
   event->params.SetString("pipeline_state", PipelineStateToString(state));
-  return event.release();
+  return event.Pass();
 }
 
-MediaLogEvent* MediaLog::CreatePipelineErrorEvent(PipelineStatus error) {
+scoped_ptr<MediaLogEvent> MediaLog::CreatePipelineErrorEvent(
+    PipelineStatus error) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PIPELINE_ERROR));
   event->params.SetString("pipeline_error", PipelineStatusToString(error));
-  return event.release();
+  return event.Pass();
 }
 
-MediaLogEvent* MediaLog::CreateVideoSizeSetEvent(size_t width, size_t height) {
+scoped_ptr<MediaLogEvent> MediaLog::CreateVideoSizeSetEvent(
+    size_t width, size_t height) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::VIDEO_SIZE_SET));
   event->params.SetInteger("width", width);
   event->params.SetInteger("height", height);
-  return event.release();
+  return event.Pass();
 }
 
-MediaLogEvent* MediaLog::CreateBufferedExtentsChangedEvent(
+scoped_ptr<MediaLogEvent> MediaLog::CreateBufferedExtentsChangedEvent(
     size_t start, size_t current, size_t end) {
   scoped_ptr<MediaLogEvent> event(
       CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED));
   event->params.SetInteger("buffer_start", start);
   event->params.SetInteger("buffer_current", current);
   event->params.SetInteger("buffer_end", end);
-  return event.release();
+  return event.Pass();
 }
 
 void MediaLog::QueueStatisticsUpdatedEvent(PipelineStatistics stats) {
   base::AutoLock auto_lock(stats_lock_);
   last_statistics_ = stats;
 
   // Sadly, this function can get dispatched on threads not running a message
   // loop.  Happily, this is pretty rare (only VideoRendererBase at this time)
   // so we simply leave stats updating for another call to trigger.
   if (!stats_update_pending_ && MessageLoop::current()) {
@@ skipping 10 matching lines @@
   scoped_ptr<MediaLogEvent> event(
       CreateEvent(MediaLogEvent::STATISTICS_UPDATED));
   event->params.SetInteger("audio_bytes_decoded",
                            last_statistics_.audio_bytes_decoded);
   event->params.SetInteger("video_bytes_decoded",
                            last_statistics_.video_bytes_decoded);
   event->params.SetInteger("video_frames_decoded",
                            last_statistics_.video_frames_decoded);
   event->params.SetInteger("video_frames_dropped",
                            last_statistics_.video_frames_dropped);
-  AddEvent(event.release());
+  AddEvent(event.Pass());
   stats_update_pending_ = false;
 }
 
 }  //namespace media