Revert of Add builders for tracing event's structural arguments

cc/resources/picture.cc

Index: cc/resources/picture.cc
diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc
index e206e8db5070b380a1bce6faa8d54a2037c39e98..959e64cd1445f67596f0ae2afa492df5748e77f5 100644
--- a/cc/resources/picture.cc
+++ b/cc/resources/picture.cc
@@ -10,7 +10,6 @@
 
 #include "base/base64.h"
 #include "base/debug/trace_event.h"
-#include "base/debug/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/base/util.h"
@@ -587,22 +586,18 @@
 
 scoped_refptr<base::debug::ConvertableToTraceFormat>
     Picture::AsTraceableRasterData(float scale) const {
-  scoped_refptr<base::debug::TracedValue> raster_data =
-      new base::debug::TracedValue();
-  TracedValue::SetIDRef(this, raster_data.get(), "picture_id");
+  scoped_ptr<base::DictionaryValue> raster_data(new base::DictionaryValue());
+  raster_data->Set("picture_id", TracedValue::CreateIDRef(this).release());
   raster_data->SetDouble("scale", scale);
-  return raster_data;
+  return TracedValue::FromValue(raster_data.release());
 }
 
 scoped_refptr<base::debug::ConvertableToTraceFormat>
     Picture::AsTraceableRecordData() const {
-  scoped_refptr<base::debug::TracedValue> record_data =
-      new base::debug::TracedValue();
-  TracedValue::SetIDRef(this, record_data.get(), "picture_id");
-  record_data->BeginArray("layer_rect");
-  MathUtil::AddToTracedValue(layer_rect_, record_data.get());
-  record_data->EndArray();
-  return record_data;
+  scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue());
+  record_data->Set("picture_id", TracedValue::CreateIDRef(this).release());
+  record_data->Set("layer_rect", MathUtil::AsValue(layer_rect_).release());
+  return TracedValue::FromValue(record_data.release());
 }
 
 }  // namespace cc