Revert of Add builders for tracing event's structural arguments

cc/output/begin_frame_args.cc

 // Copyright 2013 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/output/begin_frame_args.h"
-
-#include "base/debug/trace_event_argument.h"
 #include "ui/gfx/frame_time.h"
 
 namespace cc {
 
 BeginFrameArgs::BeginFrameArgs()
   : frame_time(base::TimeTicks()),
     deadline(base::TimeTicks()),
     interval(base::TimeDelta::FromMicroseconds(-1)) {
 }
 
 BeginFrameArgs::BeginFrameArgs(base::TimeTicks frame_time,
                                base::TimeTicks deadline,
                                base::TimeDelta interval)
   : frame_time(frame_time),
     deadline(deadline),
     interval(interval)
 {}
 
 BeginFrameArgs BeginFrameArgs::Create(base::TimeTicks frame_time,
                                       base::TimeTicks deadline,
                                       base::TimeDelta interval) {
   return BeginFrameArgs(frame_time, deadline, interval);
 }
 
-scoped_refptr<base::debug::ConvertableToTraceFormat> BeginFrameArgs::AsValue()
-    const {
-  scoped_refptr<base::debug::TracedValue> state =
-      new base::debug::TracedValue();
-  AsValueInto(state.get());
-  return state;
-}
-
-void BeginFrameArgs::AsValueInto(base::debug::TracedValue* state) const {
+scoped_ptr<base::Value> BeginFrameArgs::AsValue() const {
+  scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue);
   state->SetString("type", "BeginFrameArgs");
   state->SetDouble("frame_time_us", frame_time.ToInternalValue());
   state->SetDouble("deadline_us", deadline.ToInternalValue());
   state->SetDouble("interval_us", interval.InMicroseconds());
+  return state.PassAs<base::Value>();
 }
 
 BeginFrameArgs BeginFrameArgs::CreateForSynchronousCompositor(
     base::TimeTicks now) {
   // For WebView/SynchronousCompositor, we always want to draw immediately,
   // so we set the deadline to 0 and guess that the interval is 16 milliseconds.
   if (now.is_null())
     now = gfx::FrameTime::Now();
   return BeginFrameArgs(now, base::TimeTicks(), DefaultInterval());
 }
@@ skipping 10 matching lines @@
 
 base::TimeDelta BeginFrameArgs::DefaultInterval() {
   return base::TimeDelta::FromMicroseconds(16666);
 }
 
 base::TimeDelta BeginFrameArgs::DefaultRetroactiveBeginFramePeriod() {
   return base::TimeDelta::FromMicroseconds(4444);
 }
 
 }  // namespace cc