summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/shell.cc2
-rw-r--r--extensions/browser/value_store/value_store_frontend.cc2
-rw-r--r--extensions/renderer/module_system.cc2
-rw-r--r--google_apis/gaia/account_tracker.cc2
-rw-r--r--ipc/ipc_message.h2
-rw-r--r--ipc/ipc_sync_channel.cc2
-rw-r--r--native_client_sdk/src/libraries/xray/browser.c2
-rw-r--r--storage/browser/fileapi/file_system_usage_cache.cc2
-rw-r--r--third_party/leveldatabase/env_chromium.cc2
-rw-r--r--third_party/libjingle/overrides/init_webrtc.cc2
-rw-r--r--tools/telemetry/telemetry/core/platform/tracing_options.py4
-rw-r--r--ui/events/ozone/evdev/event_factory_evdev.cc2
-rw-r--r--ui/events/ozone/evdev/input_device_factory_evdev.cc2
-rw-r--r--webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc2
14 files changed, 15 insertions, 15 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index 75bc428..b51a75a 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -79,7 +79,7 @@
#include "ash/wm/window_util.h"
#include "ash/wm/workspace_controller.h"
#include "base/bind.h"
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
#include "ui/aura/layout_manager.h"
diff --git a/extensions/browser/value_store/value_store_frontend.cc b/extensions/browser/value_store/value_store_frontend.cc
index 58318c3..41ebf13 100644
--- a/extensions/browser/value_store/value_store_frontend.cc
+++ b/extensions/browser/value_store/value_store_frontend.cc
@@ -5,9 +5,9 @@
#include "extensions/browser/value_store/value_store_frontend.h"
#include "base/bind.h"
-#include "base/debug/trace_event.h"
#include "base/files/file_path.h"
#include "base/logging.h"
+#include "base/trace_event/trace_event.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/value_store/leveldb_value_store.h"
diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc
index 78d485c..a9572e3 100644
--- a/extensions/renderer/module_system.cc
+++ b/extensions/renderer/module_system.cc
@@ -6,10 +6,10 @@
#include "base/bind.h"
#include "base/command_line.h"
-#include "base/debug/trace_event.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+#include "base/trace_event/trace_event.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "extensions/common/extension.h"
diff --git a/google_apis/gaia/account_tracker.cc b/google_apis/gaia/account_tracker.cc
index 50c4e70..c3653ac 100644
--- a/google_apis/gaia/account_tracker.cc
+++ b/google_apis/gaia/account_tracker.cc
@@ -4,9 +4,9 @@
#include "google_apis/gaia/account_tracker.h"
-#include "base/debug/trace_event.h"
#include "base/logging.h"
#include "base/stl_util.h"
+#include "base/trace_event/trace_event.h"
#include "net/url_request/url_request_context_getter.h"
namespace gaia {
diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h
index f25e91b..09d335c 100644
--- a/ipc/ipc_message.h
+++ b/ipc/ipc_message.h
@@ -8,9 +8,9 @@
#include <string>
#include "base/basictypes.h"
-#include "base/debug/trace_event.h"
#include "base/files/file.h"
#include "base/pickle.h"
+#include "base/trace_event/trace_event.h"
#include "ipc/ipc_export.h"
#if !defined(NDEBUG)
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc
index a6ef27a..06cd46f 100644
--- a/ipc/ipc_sync_channel.cc
+++ b/ipc/ipc_sync_channel.cc
@@ -5,7 +5,6 @@
#include "ipc/ipc_sync_channel.h"
#include "base/bind.h"
-#include "base/debug/trace_event.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/logging.h"
@@ -13,6 +12,7 @@
#include "base/synchronization/waitable_event_watcher.h"
#include "base/thread_task_runner_handle.h"
#include "base/threading/thread_local.h"
+#include "base/trace_event/trace_event.h"
#include "ipc/ipc_channel_factory.h"
#include "ipc/ipc_logging.h"
#include "ipc/ipc_message_macros.h"
diff --git a/native_client_sdk/src/libraries/xray/browser.c b/native_client_sdk/src/libraries/xray/browser.c
index 7f12459..a150c5a 100644
--- a/native_client_sdk/src/libraries/xray/browser.c
+++ b/native_client_sdk/src/libraries/xray/browser.c
@@ -40,7 +40,7 @@ struct XRayTimestampPair XRayGenerateTimestampsNow(void) {
return pair;
}
-/* see chromium/src/base/debug/trace_event.h */
+/* see chromium/src/base/trace_event/trace_event.h */
#define TRACE_VALUE_TYPE_UINT (2)
#define TRACE_VALUE_TYPE_DOUBLE (4)
#define TRACE_VALUE_TYPE_COPY_STRING (7)
diff --git a/storage/browser/fileapi/file_system_usage_cache.cc b/storage/browser/fileapi/file_system_usage_cache.cc
index b8938af..880985b 100644
--- a/storage/browser/fileapi/file_system_usage_cache.cc
+++ b/storage/browser/fileapi/file_system_usage_cache.cc
@@ -7,11 +7,11 @@
#include <utility>
#include "base/bind.h"
-#include "base/debug/trace_event.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/pickle.h"
#include "base/stl_util.h"
+#include "base/trace_event/trace_event.h"
#include "storage/browser/fileapi/timed_task_helper.h"
namespace storage {
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc
index a12edf4..1a150d1 100644
--- a/third_party/leveldatabase/env_chromium.cc
+++ b/third_party/leveldatabase/env_chromium.cc
@@ -9,7 +9,6 @@
#include <sys/types.h>
#endif
-#include "base/debug/trace_event.h"
#include "base/files/file_util.h"
#include "base/lazy_instance.h"
#include "base/memory/shared_memory.h"
@@ -17,6 +16,7 @@
#include "base/process/process_metrics.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/trace_event/trace_event.h"
#include "third_party/leveldatabase/chromium_logger.h"
#include "third_party/re2/re2/re2.h"
diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc
index 3fc1f25..63e963e 100644
--- a/third_party/libjingle/overrides/init_webrtc.cc
+++ b/third_party/libjingle/overrides/init_webrtc.cc
@@ -5,13 +5,13 @@
#include "init_webrtc.h"
#include "base/command_line.h"
-#include "base/debug/trace_event.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/native_library.h"
#include "base/path_service.h"
+#include "base/trace_event/trace_event.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/logging.h"
diff --git a/tools/telemetry/telemetry/core/platform/tracing_options.py b/tools/telemetry/telemetry/core/platform/tracing_options.py
index 3e9c70d..693edf2 100644
--- a/tools/telemetry/telemetry/core/platform/tracing_options.py
+++ b/tools/telemetry/telemetry/core/platform/tracing_options.py
@@ -21,8 +21,8 @@ class TracingOptions(object):
platform display tracing.
record_mode: can be any mode in RECORD_MODES. This corresponds to
record modes in chrome (see
- TraceRecordMode in base/debug/trace_event_impl.h for more
- information)
+ TraceRecordMode in base/trace_event/trace_event_impl.h for
+ more information)
"""
def __init__(self):
self.enable_chrome_trace = False
diff --git a/ui/events/ozone/evdev/event_factory_evdev.cc b/ui/events/ozone/evdev/event_factory_evdev.cc
index fcf4d34..12d5d92 100644
--- a/ui/events/ozone/evdev/event_factory_evdev.cc
+++ b/ui/events/ozone/evdev/event_factory_evdev.cc
@@ -5,11 +5,11 @@
#include "ui/events/ozone/evdev/event_factory_evdev.h"
#include "base/bind.h"
-#include "base/debug/trace_event.h"
#include "base/task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "base/threading/worker_pool.h"
#include "base/time/time.h"
+#include "base/trace_event/trace_event.h"
#include "ui/events/devices/device_data_manager.h"
#include "ui/events/devices/input_device.h"
#include "ui/events/ozone/device/device_event.h"
diff --git a/ui/events/ozone/evdev/input_device_factory_evdev.cc b/ui/events/ozone/evdev/input_device_factory_evdev.cc
index db050a1..f215cd7 100644
--- a/ui/events/ozone/evdev/input_device_factory_evdev.cc
+++ b/ui/events/ozone/evdev/input_device_factory_evdev.cc
@@ -7,12 +7,12 @@
#include <fcntl.h>
#include <linux/input.h>
-#include "base/debug/trace_event.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/thread_task_runner_handle.h"
#include "base/threading/worker_pool.h"
#include "base/time/time.h"
+#include "base/trace_event/trace_event.h"
#include "ui/events/devices/device_data_manager.h"
#include "ui/events/devices/device_util_linux.h"
#include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
diff --git a/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc
index 92e99de..db313a1 100644
--- a/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc
+++ b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc
@@ -4,8 +4,8 @@
#include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h"
-#include "base/debug/trace_event.h"
#include "base/lazy_instance.h"
+#include "base/trace_event/trace_event.h"
#include "gpu/blink/webgraphicscontext3d_impl.h"
#include "gpu/command_buffer/client/gles2_lib.h"
#include "third_party/skia/include/gpu/GrContext.h"
generated by cgit v1.1 at 2024-07-16 08:29:04 +0000