Convert Pass()→std::move() in //media

media/base/media_log.cc

 // Copyright (c) 2012 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 <utility>
+
 #include "base/atomic_sequence_num.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 
 namespace media {
 
 // A count of all MediaLogs created in the current process. Used to generate
 // unique IDs.
 static base::StaticAtomicSequenceNumber g_media_log_count;
 
@@ skipping 123 matching lines @@
 
 MediaLog::~MediaLog() {}
 
 void MediaLog::AddEvent(scoped_ptr<MediaLogEvent> event) {}
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateEvent(MediaLogEvent::Type type) {
   scoped_ptr<MediaLogEvent> event(new MediaLogEvent);
   event->id = id_;
   event->type = type;
   event->time = base::TimeTicks::Now();
-  return event.Pass();
+  return event;
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateBooleanEvent(
     MediaLogEvent::Type type,
     const std::string& property,
     bool value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(type));
   event->params.SetBoolean(property, value);
-  return event.Pass();
+  return event;
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateStringEvent(
     MediaLogEvent::Type type,
     const std::string& property,
     const std::string& value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(type));
   event->params.SetString(property, value);
-  return event.Pass();
+  return event;
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateTimeEvent(
     MediaLogEvent::Type type,
     const std::string& property,
     base::TimeDelta value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(type));
   if (value.is_max())
     event->params.SetString(property, "unknown");
   else
     event->params.SetDouble(property, value.InSecondsF());
-  return event.Pass();
+  return event;
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateLoadEvent(const std::string& url) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::LOAD));
   event->params.SetString("url", url);
-  return event.Pass();
+  return event;
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateSeekEvent(float seconds) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::SEEK));
   event->params.SetDouble("seek_target", seconds);
-  return event.Pass();
+  return event;
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreatePipelineStateChangedEvent(
     Pipeline::State state) {
   scoped_ptr<MediaLogEvent> event(
       CreateEvent(MediaLogEvent::PIPELINE_STATE_CHANGED));
   event->params.SetString("pipeline_state", Pipeline::GetStateString(state));
-  return event.Pass();
+  return event;
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreatePipelineErrorEvent(
     PipelineStatus error) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PIPELINE_ERROR));
   event->params.SetInteger("pipeline_error", error);
-  return event.Pass();
+  return event;
 }
 
 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.Pass();
+  return event;
 }
 
 scoped_ptr<MediaLogEvent> MediaLog::CreateBufferedExtentsChangedEvent(
     int64_t start,
     int64_t current,
     int64_t end) {
   scoped_ptr<MediaLogEvent> event(
       CreateEvent(MediaLogEvent::BUFFERED_EXTENTS_CHANGED));
   // These values are headed to JS where there is no int64_t so we use a double
   // and accept loss of precision above 2^53 bytes (8 Exabytes).
   event->params.SetDouble("buffer_start", start);
   event->params.SetDouble("buffer_current", current);
   event->params.SetDouble("buffer_end", end);
-  return event.Pass();
+  return event;
 }
 
 void MediaLog::AddLogEvent(MediaLogLevel level, const std::string& message) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogLevelToEventType(level)));
   event->params.SetString(MediaLogLevelToString(level), message);
-  AddEvent(event.Pass());
+  AddEvent(std::move(event));
 }
 
 void MediaLog::SetStringProperty(
     const std::string& key, const std::string& value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE));
   event->params.SetString(key, value);
-  AddEvent(event.Pass());
+  AddEvent(std::move(event));
 }
 
 void MediaLog::SetIntegerProperty(
     const std::string& key, int value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE));
   event->params.SetInteger(key, value);
-  AddEvent(event.Pass());
+  AddEvent(std::move(event));
 }
 
 void MediaLog::SetDoubleProperty(
     const std::string& key, double value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE));
   event->params.SetDouble(key, value);
-  AddEvent(event.Pass());
+  AddEvent(std::move(event));
 }
 
 void MediaLog::SetBooleanProperty(
     const std::string& key, bool value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE));
   event->params.SetBoolean(key, value);
-  AddEvent(event.Pass());
+  AddEvent(std::move(event));
 }
 
 void MediaLog::SetTimeProperty(
     const std::string& key, base::TimeDelta value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE));
   if (value.is_max())
     event->params.SetString(key, "unknown");
   else
     event->params.SetDouble(key, value.InSecondsF());
-  AddEvent(event.Pass());
+  AddEvent(std::move(event));
 }
 
 LogHelper::LogHelper(MediaLog::MediaLogLevel level,
                      const scoped_refptr<MediaLog>& media_log)
     : level_(level), media_log_(media_log) {
   DCHECK(media_log_.get());
 }
 
 LogHelper::~LogHelper() {
   media_log_->AddLogEvent(level_, stream_.str());
 }
 
 }  //namespace media