summaryrefslogtreecommitdiffstats
path: root/ui/compositor
diff options
context:
space:
mode:
authorprimiano <primiano@chromium.org>2015-01-28 03:58:45 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-28 12:00:36 +0000
commit51a9c2e81d6e39833e6bcea20b377675bfd3e465 (patch)
treeb017e57a529fc31b057c061a906295eaf3f175a8 /ui/compositor
parent1ec543761663537283abbe2f2ddef51b6320f995 (diff)
downloadchromium_src-51a9c2e81d6e39833e6bcea20b377675bfd3e465.zip
chromium_src-51a9c2e81d6e39833e6bcea20b377675bfd3e465.tar.gz
chromium_src-51a9c2e81d6e39833e6bcea20b377675bfd3e465.tar.bz2
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}
Diffstat (limited to 'ui/compositor')
-rw-r--r--ui/compositor/test/in_process_context_provider.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/compositor/test/in_process_context_provider.cc b/ui/compositor/test/in_process_context_provider.cc
index 3ad2195..5627f29 100644
--- a/ui/compositor/test/in_process_context_provider.cc
+++ b/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"