Revert of Add builders for tracing event's structural arguments

cc/quads/render_pass_draw_quad.cc

Index: cc/quads/render_pass_draw_quad.cc
diff --git a/cc/quads/render_pass_draw_quad.cc b/cc/quads/render_pass_draw_quad.cc
index 380f2f6619337e1d8af761f148c32adff1df537e..6259fdf4afbb57c9d3b2ac53810ec114e67a275a 100644
--- a/cc/quads/render_pass_draw_quad.cc
+++ b/cc/quads/render_pass_draw_quad.cc
@@ -4,7 +4,6 @@
 
 #include "cc/quads/render_pass_draw_quad.h"
 
-#include "base/debug/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/traced_value.h"
@@ -82,24 +81,16 @@
   return static_cast<const RenderPassDrawQuad*>(quad);
 }
 
-void RenderPassDrawQuad::ExtendValue(base::debug::TracedValue* value) const {
-  TracedValue::SetIDRef(render_pass_id.AsTracingId(), value, "render_pass_id");
+void RenderPassDrawQuad::ExtendValue(base::DictionaryValue* value) const {
+  value->Set("render_pass_id",
+             TracedValue::CreateIDRef(render_pass_id.AsTracingId()).release());
   value->SetBoolean("is_replica", is_replica);
   value->SetInteger("mask_resource_id", mask_resource_id);
-  value->BeginArray("contents_changed_since_last_frame");
-  MathUtil::AddToTracedValue(contents_changed_since_last_frame, value);
-  value->EndArray();
-
-  value->BeginArray("mask_uv_rect");
-  MathUtil::AddToTracedValue(mask_uv_rect, value);
-  value->EndArray();
-  value->BeginDictionary("filters");
-  filters.AsValueInto(value);
-  value->EndDictionary();
-
-  value->BeginDictionary("background_filters");
-  background_filters.AsValueInto(value);
-  value->EndDictionary();
+  value->Set("contents_changed_since_last_frame",
+             MathUtil::AsValue(contents_changed_since_last_frame).release());
+  value->Set("mask_uv_rect", MathUtil::AsValue(mask_uv_rect).release());
+  value->Set("filters", filters.AsValue().release());
+  value->Set("background_filters", background_filters.AsValue().release());
 }
 
 }  // namespace cc