Update tracing includes in .mm files and generator for /ui

This is a follow up to crrev.com/866893002 which fixed the tracing
includes without updating the generator.
This CL involves mostly mechanical changes to trace include headers.
See crrev.com/837303004 and the related bug for motivations.

BUG=451032
TBR=thakis@chromium.org

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

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

ui/accelerated_widget_mac/accelerated_widget_mac.mm

@@ -6,9 +6,9 @@
 
 #include <map>
 
-#include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
+#include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/accelerated_widget_mac/io_surface_layer.h"
 #include "ui/accelerated_widget_mac/surface_handle_types.h"

ui/accelerated_widget_mac/io_surface_context.mm

@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "base/command_line.h"
-#include "base/debug/trace_event.h"
 #include "base/logging.h"
+#include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 

ui/accelerated_widget_mac/io_surface_layer.mm

@@ -10,8 +10,8 @@
 #include <OpenGL/gl.h>
 #include <OpenGL/OpenGL.h>
 
-#include "base/debug/trace_event.h"
 #include "base/mac/sdk_forward_declarations.h"
+#include "base/trace_event/trace_event.h"
 #include "ui/accelerated_widget_mac/io_surface_context.h"
 #include "ui/accelerated_widget_mac/io_surface_texture.h"
 #include "ui/base/cocoa/animation_utils.h"

ui/accelerated_widget_mac/io_surface_texture.mm

@@ -12,11 +12,11 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
-#include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/platform_thread.h"
+#include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/accelerated_widget_mac/io_surface_context.h"
 #include "ui/gfx/geometry/rect.h"

ui/accelerated_widget_mac/software_layer.mm

@@ -4,10 +4,10 @@
 
 #include "ui/accelerated_widget_mac/software_layer.h"
 
-#include "base/debug/trace_event.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/sdk_forward_declarations.h"
+#include "base/trace_event/trace_event.h"
 #include "ui/base/cocoa/animation_utils.h"
 
 @implementation SoftwareLayer

ui/compositor/test/in_process_context_provider.cc

@@ -6,9 +6,9 @@
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
-#include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
+#include "base/trace_event/trace_event.h"
 #include "cc/output/managed_memory_policy.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"

ui/gl/generate_bindings.py

@@ -1824,7 +1824,7 @@ def GenerateSource(file, functions, set_name, used_extensions):
   """Generates gl_bindings_autogen_x.cc"""
 
   set_header_name = "ui/gl/gl_" + set_name.lower() + "_api_implementation.h"
-  include_list = [ 'base/debug/trace_event.h',
+  include_list = [ 'base/trace_event/trace_event.h',
                    'ui/gl/gl_enums.h',
                    'ui/gl/gl_bindings.h',
                    'ui/gl/gl_context.h',

ui/gl/gl_context_mac.mm

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-#include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_context_cgl.h"
 #include "ui/gl/gl_context_osmesa.h"
 #include "ui/gl/gl_context_stub.h"