Remove TraceEvent stub header from cc

We can just use base/debug/trace_event.h directly. Unfortunately, this produces
several more LOG macro collisions between wtf/Assertions.h and base/logging.h. I
added a config.h stub to cc/stubs/ to undef LOG for all files in cc and removed
the few other overrides we had in place.

BUG=154451


Review URL: https://chromiumcodereview.appspot.com/11187035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162692 0039d316-1c4b-4281-b951-d872f2087c98

30 files changed, 38 insertions, 51 deletions

diff --git a/cc/DEPS b/cc/DEPS
index 32e11cc..fafd0e2 100644
--- a/cc/DEPS
+++ b/cc/DEPS
@@ -35,5 +35,8 @@ include_rules = [
   "+webkit/compositor_bindings/web_compositor_support_impl.h",
   "+webkit/glue/webthread_impl.h",
 # http://crbug.com/154052
-  "+webkit/glue/webkit_glue_export.h"
+  "+webkit/glue/webkit_glue_export.h",
+# http://crbug.com/154451
+  "+third_party/WebKit/Source/WTF/config.h",
+  "+Source/WTF/config.h",
 ]
diff --git a/cc/active_animation.cc b/cc/active_animation.cc
index b1817d1..565553b 100644
--- a/cc/active_animation.cc
+++ b/cc/active_animation.cc
@@ -7,10 +7,7 @@
 #include "CCActiveAnimation.h"
 
 #include "CCAnimationCurve.h"
-#include "TraceEvent.h"
-#ifdef LOG
-#undef LOG
-#endif
+#include "base/debug/trace_event.h"
 #include "base/string_util.h"
 #include <cmath>
 
diff --git a/cc/canvas_layer_texture_updater.cc b/cc/canvas_layer_texture_updater.cc
index 846575e..6af93d9 100644
--- a/cc/canvas_layer_texture_updater.cc
+++ b/cc/canvas_layer_texture_updater.cc
@@ -9,7 +9,7 @@
 #include "CCRenderingStats.h"
 #include "FloatRect.h"
 #include "SkiaUtils.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include "cc/layer_painter.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 59f659b..bdb81d6 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -355,9 +355,9 @@
         'stubs/Region.h',
         'stubs/SkiaUtils.h',
         'stubs/TilingData.h',
-        'stubs/TraceEvent.h',
         'stubs/UnitBezier.h',
 
+        'stubs/config.h',
         'stubs/extensions_3d_chromium.h',
         'stubs/extensions_3d.h',
         'stubs/float_point_3d.h',
@@ -373,7 +373,6 @@
         'stubs/not_implemented.h',
         'stubs/skia_utils.h',
         'stubs/tiling_data.h',
-        'stubs/trace_event.h',
         'stubs/unit_bezier.h',
       ],
     },
diff --git a/cc/content_layer.cc b/cc/content_layer.cc
index 6387652..32ff381 100644
--- a/cc/content_layer.cc
+++ b/cc/content_layer.cc
@@ -8,9 +8,6 @@
 
 #include "CCLayerTreeHost.h"
 #include "CCSettings.h"
-#ifdef LOG
-#undef LOG
-#endif
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "cc/bitmap_canvas_layer_texture_updater.h"
diff --git a/cc/delay_based_time_source.cc b/cc/delay_based_time_source.cc
index be0b10b..56a2e04 100644
--- a/cc/delay_based_time_source.cc
+++ b/cc/delay_based_time_source.cc
@@ -6,7 +6,7 @@
 
 #include "CCDelayBasedTimeSource.h"
 
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include <algorithm>
 #include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
diff --git a/cc/frame_rate_controller.cc b/cc/frame_rate_controller.cc
index c996ebd..8d4ff8e 100644
--- a/cc/frame_rate_controller.cc
+++ b/cc/frame_rate_controller.cc
@@ -8,7 +8,7 @@
 
 #include "CCDelayBasedTimeSource.h"
 #include "CCTimeSource.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include <wtf/CurrentTime.h>
 
 namespace {
diff --git a/cc/frame_rate_counter.cc b/cc/frame_rate_counter.cc
index f9b203c..5f4fe03 100644
--- a/cc/frame_rate_counter.cc
+++ b/cc/frame_rate_counter.cc
@@ -9,9 +9,6 @@
 #include <cmath>
 
 #include "CCProxy.h"
-#ifdef LOG
-#undef LOG
-#endif
 #include "base/metrics/histogram.h"
 
 namespace cc {
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 18c9f4f..773a88e 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -20,10 +20,7 @@
 #include "FloatQuad.h"
 #include "GrTexture.h"
 #include "NotImplemented.h"
-#include "TraceEvent.h"
-#ifdef LOG
-#undef LOG
-#endif
+#include "base/debug/trace_event.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "cc/geometry_binding.h"
diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc
index 0396fa5..5e0439a 100644
--- a/cc/heads_up_display_layer.cc
+++ b/cc/heads_up_display_layer.cc
@@ -8,7 +8,7 @@
 
 #include "CCHeadsUpDisplayLayerImpl.h"
 #include "CCLayerTreeHost.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 
 namespace cc {
 
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index 2b30363..fcab26e 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -6,6 +6,7 @@
 
 #include "CCLayerImpl.h"
 
+#include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCLayerSorter.h"
@@ -14,7 +15,6 @@
 #include "CCQuadSink.h"
 #include "CCScrollbarAnimationController.h"
 #include "CCSettings.h"
-#include "TraceEvent.h"
 
 using WebKit::WebTransformationMatrix;
 
diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc
index 597f403..a02f2115 100644
--- a/cc/layer_sorter.cc
+++ b/cc/layer_sorter.cc
@@ -8,9 +8,6 @@
 
 #include "CCMathUtil.h"
 #include "CCRenderSurface.h"
-#ifdef LOG
-#undef LOG
-#endif
 #include "base/logging.h"
 #include <limits.h>
 #include <public/WebTransformationMatrix.h>
diff --git a/cc/layer_texture_sub_image.cc b/cc/layer_texture_sub_image.cc
index da27507..80509ee 100644
--- a/cc/layer_texture_sub_image.cc
+++ b/cc/layer_texture_sub_image.cc
@@ -9,7 +9,7 @@
 #include "CCRendererGL.h" // For the GLC() macro.
 #include "GraphicsContext3D.h"
 #include "Extensions3DChromium.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include <public/WebGraphicsContext3D.h>
 
 using WebKit::WebGraphicsContext3D;
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 8d4d63b..73d6054 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -20,7 +20,7 @@
 #include "CCSingleThreadProxy.h"
 #include "CCThreadProxy.h"
 #include "Region.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include "cc/heads_up_display_layer.h"
 #include "cc/layer.h"
 #include "cc/tree_synchronizer.h"
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 51cf1e2..a499656 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -28,7 +28,7 @@
 #include "CCScrollbarLayerImpl.h"
 #include "CCSettings.h"
 #include "CCSingleThreadProxy.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include "base/basictypes.h"
 #include "cc/texture_uploader.h"
 #include <wtf/CurrentTime.h>
diff --git a/cc/overdraw_metrics.cc b/cc/overdraw_metrics.cc
index f0b077d..765d245 100644
--- a/cc/overdraw_metrics.cc
+++ b/cc/overdraw_metrics.cc
@@ -11,7 +11,7 @@
 #include "CCMathUtil.h"
 #include "FloatQuad.h"
 #include "IntRect.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include <public/WebTransformationMatrix.h>
 
diff --git a/cc/prioritized_texture_manager.cc b/cc/prioritized_texture_manager.cc
index ccde22f..103b712 100644
--- a/cc/prioritized_texture_manager.cc
+++ b/cc/prioritized_texture_manager.cc
@@ -6,11 +6,11 @@
 
 #include "CCPrioritizedTextureManager.h"
 
+#include "base/debug/trace_event.h"
 #include "base/stl_util.h"
 #include "CCPrioritizedTexture.h"
 #include "CCPriorityCalculator.h"
 #include "CCProxy.h"
-#include "TraceEvent.h"
 #include <algorithm>
 
 using namespace std;
diff --git a/cc/program_binding.cc b/cc/program_binding.cc
index 094020b..3cceaa1 100644
--- a/cc/program_binding.cc
+++ b/cc/program_binding.cc
@@ -8,7 +8,7 @@
 
 #include "CCRendererGL.h" // For the GLC() macro.
 #include "GraphicsContext3D.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include "cc/geometry_binding.h"
 #include <public/WebGraphicsContext3D.h>
 
diff --git a/cc/rate_limiter.cc b/cc/rate_limiter.cc
index b26959e..4e1f511 100644
--- a/cc/rate_limiter.cc
+++ b/cc/rate_limiter.cc
@@ -8,7 +8,7 @@
 
 #include "CCProxy.h"
 #include "CCThread.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/RefPtr.h>
 
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index 34b0aa6..da5f396 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -5,9 +5,6 @@
 #include "config.h"
 
 #include "CCResourceProvider.h"
-#ifdef LOG
-#undef LOG
-#endif
 
 #include <limits.h>
 
diff --git a/cc/scheduler.cc b/cc/scheduler.cc
index 869cd19..babaaf6 100644
--- a/cc/scheduler.cc
+++ b/cc/scheduler.cc
@@ -6,8 +6,8 @@
 
 #include "CCScheduler.h"
 
-#include "TraceEvent.h"
-#include <base/auto_reset.h>
+#include "base/debug/trace_event.h"
+#include "base/auto_reset.h"
 
 namespace cc {
 
diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc
index d75a79c..0f76d92 100644
--- a/cc/scrollbar_layer.cc
+++ b/cc/scrollbar_layer.cc
@@ -9,8 +9,8 @@
 #include "CCLayerTreeHost.h"
 #include "CCScrollbarLayerImpl.h"
 #include "CCTextureUpdateQueue.h"
-#include "TraceEvent.h"
 #include "base/basictypes.h"
+#include "base/debug/trace_event.h"
 #include "cc/layer_painter.h"
 #include <public/WebRect.h>
 
diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc
index c5a07f0..d6648d6 100644
--- a/cc/single_thread_proxy.cc
+++ b/cc/single_thread_proxy.cc
@@ -11,7 +11,7 @@
 #include "CCLayerTreeHost.h"
 #include "CCTextureUpdateController.h"
 #include "CCTimer.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include <wtf/CurrentTime.h>
 
 using namespace WTF;
diff --git a/cc/skpicture_canvas_layer_texture_updater.cc b/cc/skpicture_canvas_layer_texture_updater.cc
index c638b42..a007c4e 100644
--- a/cc/skpicture_canvas_layer_texture_updater.cc
+++ b/cc/skpicture_canvas_layer_texture_updater.cc
@@ -7,7 +7,7 @@
 #include "cc/skpicture_canvas_layer_texture_updater.h"
 
 #include "CCTextureUpdateQueue.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include "cc/layer_painter.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
diff --git a/cc/stubs/TraceEvent.h b/cc/stubs/TraceEvent.h
deleted file mode 100644
index 27e4089..0000000
--- a/cc/stubs/TraceEvent.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// 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.
-
-// Temporary forwarding header
-#include "cc/stubs/trace_event.h"
diff --git a/cc/stubs/trace_event.h b/cc/stubs/config.h
index 75587a3..5f1e02f 100644
--- a/cc/stubs/trace_event.h
+++ b/cc/stubs/config.h
@@ -2,9 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CC_STUBS_CONFIG_H_
+#define CC_STUBS_CONFIG_H_
+
 // Chromium's LOG() macro collides with one from WTF.
+
+#if INSIDE_WEBKIT_BUILD
+#include "Source/WTF/config.h"
+#else
+#include "third_party/WebKit/Source/WTF/config.h"
+#endif
 #ifdef LOG
 #undef LOG
 #endif
 
-#include "base/debug/trace_event.h"
+#endif  // CC_STUBS_CONFIG_H_
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index a4a5328..ff6ff54 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -7,7 +7,7 @@
 #include "cc/texture_copier.h"
 
 #include "CCRendererGL.h" // For the GLC() macro.
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include <public/WebGraphicsContext3D.h>
 
 namespace cc {
diff --git a/cc/texture_update_controller.cc b/cc/texture_update_controller.cc
index 9883125..edb6bcb 100644
--- a/cc/texture_update_controller.cc
+++ b/cc/texture_update_controller.cc
@@ -7,7 +7,7 @@
 #include "CCTextureUpdateController.h"
 
 #include "CCResourceProvider.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include "cc/prioritized_texture.h"
 #include "cc/proxy.h"
 #include "cc/texture_copier.h"
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index f738f8f..1469fe3 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -15,7 +15,7 @@
 #include "CCScheduler.h"
 #include "CCScopedThreadProxy.h"
 #include "CCThreadTask.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include <public/WebSharedGraphicsContext3D.h>
 #include <wtf/CurrentTime.h>
 
diff --git a/cc/throttled_texture_uploader.cc b/cc/throttled_texture_uploader.cc
index fab8e3d..ddfe84e 100644
--- a/cc/throttled_texture_uploader.cc
+++ b/cc/throttled_texture_uploader.cc
@@ -7,7 +7,7 @@
 
 #include "CCPrioritizedTexture.h"
 #include "Extensions3DChromium.h"
-#include "TraceEvent.h"
+#include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include <algorithm>
 #include <public/WebGraphicsContext3D.h>