Revert of Add builders for tracing event's structural arguments

cc/quads/shared_quad_state.cc

 // Copyright 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 "cc/quads/shared_quad_state.h"
 
-#include "base/debug/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/traced_value.h"
 
 namespace cc {
 
 SharedQuadState::SharedQuadState()
     : is_clipped(false),
       opacity(0.f),
       blend_mode(SkXfermode::kSrcOver_Mode),
@@ skipping 21 matching lines @@
   this->content_to_target_transform = content_to_target_transform;
   this->content_bounds = content_bounds;
   this->visible_content_rect = visible_content_rect;
   this->clip_rect = clip_rect;
   this->is_clipped = is_clipped;
   this->opacity = opacity;
   this->blend_mode = blend_mode;
   this->sorting_context_id = sorting_context_id;
 }
 
-void SharedQuadState::AsValueInto(base::debug::TracedValue* value) const {
-  value->BeginArray("transform");
-  MathUtil::AddToTracedValue(content_to_target_transform, value);
-  value->EndArray();
-
-  value->BeginDictionary("layer_content_bounds");
-  MathUtil::AddToTracedValue(content_bounds, value);
-  value->EndDictionary();
-
-  value->BeginArray("layer_visible_content_rect");
-  MathUtil::AddToTracedValue(visible_content_rect, value);
-  value->EndArray();
-
+scoped_ptr<base::Value> SharedQuadState::AsValue() const {
+  scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
+  value->Set("transform",
+             MathUtil::AsValue(content_to_target_transform).release());
+  value->Set("layer_content_bounds",
+             MathUtil::AsValue(content_bounds).release());
+  value->Set("layer_visible_content_rect",
+             MathUtil::AsValue(visible_content_rect).release());
   value->SetBoolean("is_clipped", is_clipped);
-
-  value->BeginArray("clip_rect");
-  MathUtil::AddToTracedValue(clip_rect, value);
-  value->EndArray();
-
+  value->Set("clip_rect", MathUtil::AsValue(clip_rect).release());
   value->SetDouble("opacity", opacity);
   value->SetString("blend_mode", SkXfermode::ModeName(blend_mode));
   TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
       TRACE_DISABLED_BY_DEFAULT("cc.debug.quads"),
-      value,
-      "cc::SharedQuadState",
-      this);
+      value.get(), "cc::SharedQuadState", this);
+  return value.PassAs<base::Value>();
 }
 
 }  // namespace cc