Update from https://crrev.com/316786

cc/base/math_util.cc

Index: cc/base/math_util.cc
diff --git a/cc/base/math_util.cc b/cc/base/math_util.cc
index 70090d90f33375319c24f67f6551f2dbff59fb41..e2fd565eb9774943c0c75c64ada9906fc1804ebb 100644
--- a/cc/base/math_util.cc
+++ b/cc/base/math_util.cc
@@ -735,7 +735,7 @@ scoped_ptr<base::Value> MathUtil::AsValue(const gfx::PointF& pt) {
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::Size& s,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginDictionary(name);
   res->SetDouble("width", s.width());
   res->SetDouble("height", s.height());
@@ -744,7 +744,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::SizeF& s,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginDictionary(name);
   res->SetDouble("width", s.width());
   res->SetDouble("height", s.height());
@@ -753,7 +753,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::Rect& r,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   res->AppendInteger(r.x());
   res->AppendInteger(r.y());
@@ -764,7 +764,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::PointF& pt,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   res->AppendDouble(pt.x());
   res->AppendDouble(pt.y());
@@ -773,7 +773,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::Point3F& pt,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   res->AppendDouble(pt.x());
   res->AppendDouble(pt.y());
@@ -783,7 +783,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::Vector2d& v,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   res->AppendInteger(v.x());
   res->AppendInteger(v.y());
@@ -792,7 +792,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::Vector2dF& v,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   res->AppendDouble(v.x());
   res->AppendDouble(v.y());
@@ -801,7 +801,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::ScrollOffset& v,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   res->AppendDouble(v.x());
   res->AppendDouble(v.y());
@@ -810,7 +810,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::QuadF& q,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   res->AppendDouble(q.p1().x());
   res->AppendDouble(q.p1().y());
@@ -825,7 +825,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::RectF& rect,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   res->AppendDouble(rect.x());
   res->AppendDouble(rect.y());
@@ -836,7 +836,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::Transform& transform,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   const SkMatrix44& m = transform.matrix();
   for (int row = 0; row < 4; ++row) {
@@ -848,7 +848,7 @@ void MathUtil::AddToTracedValue(const char* name,
 
 void MathUtil::AddToTracedValue(const char* name,
                                 const gfx::BoxF& box,
-                                base::debug::TracedValue* res) {
+                                base::trace_event::TracedValue* res) {
   res->BeginArray(name);
   res->AppendInteger(box.x());
   res->AppendInteger(box.y());