Revert of Add builders for tracing event's structural arguments

cc/scheduler/delay_based_time_source.cc

 // Copyright 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 "cc/scheduler/delay_based_time_source.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
-#include "base/debug/trace_event_argument.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 
 namespace cc {
 
 namespace {
 
 // kDoubleTickDivisor prevents ticks from running within the specified
 // fraction of an interval.  This helps account for jitter in the timebase as
@@ skipping 259 matching lines @@
 }
 
 std::string DelayBasedTimeSource::TypeString() const {
   return "DelayBasedTimeSource";
 }
 
 std::string DelayBasedTimeSourceHighRes::TypeString() const {
   return "DelayBasedTimeSourceHighRes";
 }
 
-void DelayBasedTimeSource::AsValueInto(base::debug::TracedValue* state) const {
+scoped_ptr<base::Value> DelayBasedTimeSource::AsValue() const {
+  scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue);
   state->SetString("type", TypeString());
   state->SetDouble("last_tick_time_us", LastTickTime().ToInternalValue());
   state->SetDouble("next_tick_time_us", NextTickTime().ToInternalValue());
 
-  state->BeginDictionary("current_parameters");
-  state->SetDouble("interval_us",
-                   current_parameters_.interval.InMicroseconds());
-  state->SetDouble("tick_target_us",
-                   current_parameters_.tick_target.ToInternalValue());
-  state->EndDictionary();
+  scoped_ptr<base::DictionaryValue> state_current_parameters(
+      new base::DictionaryValue);
+  state_current_parameters->SetDouble(
+      "interval_us", current_parameters_.interval.InMicroseconds());
+  state_current_parameters->SetDouble(
+      "tick_target_us", current_parameters_.tick_target.ToInternalValue());
+  state->Set("current_parameters", state_current_parameters.release());
 
-  state->BeginDictionary("next_parameters");
-  state->SetDouble("interval_us", next_parameters_.interval.InMicroseconds());
-  state->SetDouble("tick_target_us",
-                   next_parameters_.tick_target.ToInternalValue());
-  state->EndDictionary();
+  scoped_ptr<base::DictionaryValue> state_next_parameters(
+      new base::DictionaryValue);
+  state_next_parameters->SetDouble("interval_us",
+                                   next_parameters_.interval.InMicroseconds());
+  state_next_parameters->SetDouble(
+      "tick_target_us", next_parameters_.tick_target.ToInternalValue());
+  state->Set("next_parameters", state_next_parameters.release());
 
   state->SetBoolean("active", active_);
+
+  return state.PassAs<base::Value>();
 }
 
 }  // namespace cc