Update from https://crrev.com/316786

cc/base/math_util.h

 // 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.
 
 #ifndef CC_BASE_MATH_UTIL_H_
 #define CC_BASE_MATH_UTIL_H_
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "ui/gfx/geometry/box_f.h"
 #include "ui/gfx/geometry/point3_f.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
 namespace base {
 class Value;
 namespace trace_event {
 class TracedValue;
 }
-
-// TODO(ssid): remove these aliases after the tracing clients are moved to the
-// new trace_event namespace. See crbug.com/451032. ETA: March 2015.
-namespace debug {
-using ::base::trace_event::TracedValue;
-}
 }  // namespace base
 
 namespace gfx {
 class QuadF;
 class Rect;
 class RectF;
 class Transform;
 class Vector2dF;
 class Vector2d;
 }
@@ skipping 157 matching lines @@
                                       const gfx::Vector2dF& destination);
 
   // Conversion to value.
   static scoped_ptr<base::Value> AsValue(const gfx::Size& s);
   static scoped_ptr<base::Value> AsValue(const gfx::Rect& r);
   static bool FromValue(const base::Value*, gfx::Rect* out_rect);
   static scoped_ptr<base::Value> AsValue(const gfx::PointF& q);
 
   static void AddToTracedValue(const char* name,
                                const gfx::Size& s,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::SizeF& s,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::Rect& r,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::PointF& q,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::Point3F&,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::Vector2d& v,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::Vector2dF& v,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::ScrollOffset& v,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::QuadF& q,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::RectF& rect,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::Transform& transform,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
   static void AddToTracedValue(const char* name,
                                const gfx::BoxF& box,
-                               base::debug::TracedValue* res);
+                               base::trace_event::TracedValue* res);
 
   // Returns a base::Value representation of the floating point value.
   // If the value is inf, returns max double/float representation.
   static double AsDoubleSafely(double value);
   static float AsFloatSafely(float value);
 };
 
 }  // namespace cc
 
 #endif  // CC_BASE_MATH_UTIL_H_