summaryrefslogtreecommitdiffstats
path: root/content/app
diff options
context:
space:
mode:
authorprimiano <primiano@chromium.org>2015-01-27 20:17:00 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-28 04:17:47 +0000
commit50b7444cf985e05af4150f8bf35d2d90b18398d7 (patch)
tree7150da2265dca8b06cd9b95668aecade50ba9875 /content/app
parent36a8048b97fd720153b0474bac36a8a3387f6d8f (diff)
downloadchromium_src-50b7444cf985e05af4150f8bf35d2d90b18398d7.zip
chromium_src-50b7444cf985e05af4150f8bf35d2d90b18398d7.tar.gz
chromium_src-50b7444cf985e05af4150f8bf35d2d90b18398d7.tar.bz2
Mechanical rename of tracing includes for /content [3/3]
This is just a mechanical rename of tracing includes. See crrev.com/837303004 and the related bug for motivations. BUG=451032 TBR=avi@chromium.org Review URL: https://codereview.chromium.org/872363004 Cr-Commit-Position: refs/heads/master@{#313437}
Diffstat (limited to 'content/app')
-rw-r--r--content/app/android/content_main.cc2
-rw-r--r--content/app/android/library_loader_hooks.cc2
-rw-r--r--content/app/content_main_runner.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/content/app/android/content_main.cc b/content/app/android/content_main.cc
index 55657496..f322017 100644
--- a/content/app/android/content_main.cc
+++ b/content/app/android/content_main.cc
@@ -7,8 +7,8 @@
#include "base/at_exit.h"
#include "base/base_switches.h"
#include "base/command_line.h"
-#include "base/debug/trace_event.h"
#include "base/lazy_instance.h"
+#include "base/trace_event/trace_event.h"
#include "content/public/app/content_main.h"
#include "content/public/app/content_main_delegate.h"
#include "content/public/app/content_main_runner.h"
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 6c16506..5f0c4e5 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -11,10 +11,10 @@
#include "base/android/jni_string.h"
#include "base/base_switches.h"
#include "base/command_line.h"
-#include "base/debug/trace_event.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
+#include "base/trace_event/trace_event.h"
#include "base/tracked_objects.h"
#include "content/app/android/app_jni_registrar.h"
#include "content/browser/android/browser_jni_registrar.h"
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 6302e96..2bd0acd 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -10,7 +10,6 @@
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/debug/debugger.h"
-#include "base/debug/trace_event.h"
#include "base/files/file_path.h"
#include "base/i18n/icu_util.h"
#include "base/lazy_instance.h"
@@ -26,6 +25,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+#include "base/trace_event/trace_event.h"
#include "content/browser/browser_main.h"
#include "content/common/set_process_title.h"
#include "content/common/url_schemes.h"