summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorssid <ssid@chromium.org>2015-01-27 06:21:26 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-27 14:22:44 +0000
commit3bc4c0eea06ecd00ef700d1807d542b1eae9e53c (patch)
tree8d0327f0a3d76ed117245c8f2e367709e617f50d /android_webview
parent42ad8e954a2eafaa52bc3e566747eeb274ad1ad1 (diff)
downloadchromium_src-3bc4c0eea06ecd00ef700d1807d542b1eae9e53c.zip
chromium_src-3bc4c0eea06ecd00ef700d1807d542b1eae9e53c.tar.gz
chromium_src-3bc4c0eea06ecd00ef700d1807d542b1eae9e53c.tar.bz2
Mechanical rename of tracing includes for /android_webview
This is just a mechanical rename of tracing includes. See crrev.com/837303004 and the related bug for motivations. BUG=451032 TBR=boliu@chromium.org Review URL: https://codereview.chromium.org/868753002 Cr-Commit-Position: refs/heads/master@{#313272}
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/browser_view_renderer.cc2
-rw-r--r--android_webview/browser/browser_view_renderer.h2
-rw-r--r--android_webview/browser/deferred_gpu_command_service.cc2
-rw-r--r--android_webview/browser/hardware_renderer.cc2
-rw-r--r--android_webview/browser/scoped_app_gl_state_restore.cc2
-rw-r--r--android_webview/browser/shared_renderer_state.cc2
-rw-r--r--android_webview/common/devtools_instrumentation.h2
-rw-r--r--android_webview/native/android_webview_jni_registrar.cc2
-rw-r--r--android_webview/native/java_browser_view_renderer_helper.cc2
9 files changed, 9 insertions, 9 deletions
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
index a2432ef..1ccfc11 100644
--- a/android_webview/browser/browser_view_renderer.cc
+++ b/android_webview/browser/browser_view_renderer.cc
@@ -7,10 +7,10 @@
#include "android_webview/browser/browser_view_renderer_client.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
-#include "base/debug/trace_event_argument.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
+#include "base/trace_event/trace_event_argument.h"
#include "cc/output/compositor_frame.h"
#include "content/public/common/content_switches.h"
#include "gpu/command_buffer/service/gpu_switches.h"
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
index 64e848b..bf2b23d 100644
--- a/android_webview/browser/browser_view_renderer.h
+++ b/android_webview/browser/browser_view_renderer.h
@@ -9,7 +9,7 @@
#include "android_webview/browser/shared_renderer_state.h"
#include "base/callback.h"
#include "base/cancelable_callback.h"
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
#include "content/public/browser/android/synchronous_compositor.h"
#include "content/public/browser/android/synchronous_compositor_client.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/android_webview/browser/deferred_gpu_command_service.cc b/android_webview/browser/deferred_gpu_command_service.cc
index 33ba1ac..0bcb3afd 100644
--- a/android_webview/browser/deferred_gpu_command_service.cc
+++ b/android_webview/browser/deferred_gpu_command_service.cc
@@ -6,9 +6,9 @@
#include "android_webview/browser/gl_view_renderer_manager.h"
#include "android_webview/browser/shared_renderer_state.h"
-#include "base/debug/trace_event.h"
#include "base/lazy_instance.h"
#include "base/synchronization/lock.h"
+#include "base/trace_event/trace_event.h"
#include "content/public/browser/android/synchronous_compositor.h"
#include "gpu/command_buffer/service/shader_translator_cache.h"
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index ae2c056..dc83b1b 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -10,8 +10,8 @@
#include "android_webview/browser/shared_renderer_state.h"
#include "android_webview/public/browser/draw_gl.h"
#include "base/auto_reset.h"
-#include "base/debug/trace_event.h"
#include "base/strings/string_number_conversions.h"
+#include "base/trace_event/trace_event.h"
#include "cc/layers/delegated_frame_provider.h"
#include "cc/layers/delegated_renderer_layer.h"
#include "cc/layers/layer.h"
diff --git a/android_webview/browser/scoped_app_gl_state_restore.cc b/android_webview/browser/scoped_app_gl_state_restore.cc
index 6ea3996..fe27753 100644
--- a/android_webview/browser/scoped_app_gl_state_restore.cc
+++ b/android_webview/browser/scoped_app_gl_state_restore.cc
@@ -6,8 +6,8 @@
#include <string>
-#include "base/debug/trace_event.h"
#include "base/lazy_instance.h"
+#include "base/trace_event/trace_event.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_surface_stub.h"
diff --git a/android_webview/browser/shared_renderer_state.cc b/android_webview/browser/shared_renderer_state.cc
index 9a5b479..184c86d 100644
--- a/android_webview/browser/shared_renderer_state.cc
+++ b/android_webview/browser/shared_renderer_state.cc
@@ -10,9 +10,9 @@
#include "android_webview/browser/scoped_app_gl_state_restore.h"
#include "android_webview/public/browser/draw_gl.h"
#include "base/bind.h"
-#include "base/debug/trace_event_argument.h"
#include "base/lazy_instance.h"
#include "base/location.h"
+#include "base/trace_event/trace_event_argument.h"
namespace android_webview {
diff --git a/android_webview/common/devtools_instrumentation.h b/android_webview/common/devtools_instrumentation.h
index 5007cae..fbe6f63 100644
--- a/android_webview/common/devtools_instrumentation.h
+++ b/android_webview/common/devtools_instrumentation.h
@@ -5,7 +5,7 @@
#ifndef ANDROID_WEBVIEW_COMMON_DEVTOOLS_INSTRUMENTATION_H_
#define ANDROID_WEBVIEW_COMMON_DEVTOOLS_INSTRUMENTATION_H_
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
namespace android_webview {
namespace devtools_instrumentation {
diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc
index e81853f..a9aa621 100644
--- a/android_webview/native/android_webview_jni_registrar.cc
+++ b/android_webview/native/android_webview_jni_registrar.cc
@@ -29,7 +29,7 @@
#include "android_webview/native/permission/aw_permission_request.h"
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
namespace android_webview {
diff --git a/android_webview/native/java_browser_view_renderer_helper.cc b/android_webview/native/java_browser_view_renderer_helper.cc
index 4234ae2..6e6ce39 100644
--- a/android_webview/native/java_browser_view_renderer_helper.cc
+++ b/android_webview/native/java_browser_view_renderer_helper.cc
@@ -8,7 +8,7 @@
#include "android_webview/public/browser/draw_sw.h"
#include "base/android/scoped_java_ref.h"
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
#include "jni/JavaBrowserViewRendererHelper_jni.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/utils/SkCanvasStateUtils.h"