mechanical rename of base::debug -> base::trace_event for /cc

This is the last stage of the trace_event directory restructuring.
This is part of a set of 3 CLs which is moving tracing clients to use
the new base::trace_debug namespace.
See crrev.com/837303004 and the related bug for motivations.

BUG=451032
TBR=nduca@chromium.org

Review URL: https://codereview.chromium.org/879913002

Cr-Commit-Position: refs/heads/master@{#315335}

4 files changed, 26 insertions, 38 deletions

diff --git a/cc/base/math_util.cc b/cc/base/math_util.cc
index 70090d9..e2fd565 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());
diff --git a/cc/base/math_util.h b/cc/base/math_util.h
index ddc8955..56fdd17 100644
--- a/cc/base/math_util.h
+++ b/cc/base/math_util.h
@@ -24,12 +24,6 @@ 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 {
@@ -207,40 +201,40 @@ class CC_EXPORT MathUtil {
 
   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.
diff --git a/cc/base/region.cc b/cc/base/region.cc
index 22d9585..c048c89 100644
--- a/cc/base/region.cc
+++ b/cc/base/region.cc
@@ -130,7 +130,7 @@ scoped_ptr<base::Value> Region::AsValue() const {
   return result.Pass();
 }
 
-void Region::AsValueInto(base::debug::TracedValue* result) const {
+void Region::AsValueInto(base::trace_event::TracedValue* result) const {
   for (Iterator it(*this); it.has_rect(); it.next()) {
     gfx::Rect rect(it.rect());
     result->AppendInteger(rect.x());
diff --git a/cc/base/region.h b/cc/base/region.h
index b84dbd5..583311e 100644
--- a/cc/base/region.h
+++ b/cc/base/region.h
@@ -18,13 +18,7 @@ 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 cc {
 class SimpleEnclosedRegion;
@@ -69,7 +63,7 @@ class CC_EXPORT Region {
 
   std::string ToString() const;
   scoped_ptr<base::Value> AsValue() const;
-  void AsValueInto(base::debug::TracedValue* array) const;
+  void AsValueInto(base::trace_event::TracedValue* array) const;
 
   class CC_EXPORT Iterator {
    public: