Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(756)

Unified Diff: content/browser/browser_main_loop.h

Issue 892213004: Mechanical rename of base::debug -> base::trace_event for /content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part3_1
Patch Set: Rebase. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_main.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 176c4ba073a727f5becdc9c5535f4a82cf152724..5050cd0cde34ae88635651942ffc3a6cd6c59fe7 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -27,13 +27,6 @@ namespace trace_event {
class TraceMemoryController;
class TraceEventSystemStatsMonitor;
} // namespace trace_event
-
-// TODO(ssid): remove these aliases after the tracing clients are moved to the
-// new trace_event namespace. See crbug.com/451032. ETA: March 2015
-namespace debug {
-using ::base::trace_event::TraceEventSystemStatsMonitor;
-using ::base::trace_event::TraceMemoryController;
-} // namespace debug
} // namespace base
namespace media {
@@ -219,8 +212,9 @@ class CONTENT_EXPORT BrowserMainLoop {
scoped_ptr<BrowserProcessSubThread> io_thread_;
scoped_ptr<base::Thread> indexed_db_thread_;
scoped_ptr<MemoryObserver> memory_observer_;
- scoped_ptr<base::debug::TraceMemoryController> trace_memory_controller_;
- scoped_ptr<base::debug::TraceEventSystemStatsMonitor> system_stats_monitor_;
+ scoped_ptr<base::trace_event::TraceMemoryController> trace_memory_controller_;
+ scoped_ptr<base::trace_event::TraceEventSystemStatsMonitor>
+ system_stats_monitor_;
bool is_tracing_startup_;
base::FilePath startup_trace_file_;
« no previous file with comments | « content/browser/browser_main.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698