tracing: Make ConvertableToTraceFormat move-only scoped_ptr

cc/test/ordered_simple_task_runner.cc

 // Copyright 2014 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 "cc/test/ordered_simple_task_runner.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 46 matching lines @@
     const TestOrderablePendingTask& other) const {
   if (*this == other)
     return false;
 
   if (GetTimeToRun() == other.GetTimeToRun()) {
     return task_id_ < other.task_id_;
   }
   return ShouldRunBefore(other);
 }
 
-scoped_refptr<base::trace_event::ConvertableToTraceFormat>
+scoped_ptr<base::trace_event::ConvertableToTraceFormat>
 TestOrderablePendingTask::AsValue() const {
-  scoped_refptr<base::trace_event::TracedValue> state =
-      new base::trace_event::TracedValue();
+  auto state = make_scoped_ptr(new base::trace_event::TracedValue);
   AsValueInto(state.get());
-  return state;
+  return std::move(state);
 }
 
 void TestOrderablePendingTask::AsValueInto(
     base::trace_event::TracedValue* state) const {
   state->SetInteger("id", base::saturated_cast<int>(task_id_));
   state->SetInteger("run_at", GetTimeToRun().ToInternalValue());
   state->SetString("posted_from", location.ToString());
 }
 
 OrderedSimpleTaskRunner::OrderedSimpleTaskRunner(
@@ skipping 171 matching lines @@
   }
 
   return result;
 }
 
 bool OrderedSimpleTaskRunner::RunForPeriod(base::TimeDelta period) {
   return RunUntilTime(now_src_->NowTicks() + period);
 }
 
 // base::trace_event tracing functionality
-scoped_refptr<base::trace_event::ConvertableToTraceFormat>
+scoped_ptr<base::trace_event::ConvertableToTraceFormat>
 OrderedSimpleTaskRunner::AsValue() const {
-  scoped_refptr<base::trace_event::TracedValue> state =
-      new base::trace_event::TracedValue();
+  auto state = make_scoped_ptr(new base::trace_event::TracedValue);
   AsValueInto(state.get());
-  return state;
+  return std::move(state);
 }
 
 void OrderedSimpleTaskRunner::AsValueInto(
     base::trace_event::TracedValue* state) const {
   state->SetInteger("pending_tasks",
                     base::saturated_cast<int>(pending_tasks_.size()));
 
   state->BeginArray("tasks");
   for (std::set<TestOrderablePendingTask>::const_iterator it =
            pending_tasks_.begin();
@@ skipping 56 matching lines @@
 
 bool OrderedSimpleTaskRunner::AdvanceNowCallback() {
   base::TimeTicks next_task_time = NextTaskTime();
   if (now_src_->NowTicks() < next_task_time) {
     now_src_->Advance(next_task_time - now_src_->NowTicks());
   }
   return true;
 }
 
 }  // namespace cc