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

Unified Diff: base/trace_event/trace_event_memory.h

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 11 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 | « base/trace_event/trace_event_impl_constants.cc ('k') | base/trace_event/trace_event_memory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/trace_event_memory.h
diff --git a/base/debug/trace_event_memory.h b/base/trace_event/trace_event_memory.h
similarity index 97%
rename from base/debug/trace_event_memory.h
rename to base/trace_event/trace_event_memory.h
index 94c3f91cd271e7e544dc58770294dba050cfbfc8..f16467f986b29fa5244da87bb21396b7ed544e5f 100644
--- a/base/debug/trace_event_memory.h
+++ b/base/trace_event/trace_event_memory.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_DEBUG_TRACE_EVENT_MEMORY_H_
-#define BASE_DEBUG_TRACE_EVENT_MEMORY_H_
+#ifndef BASE_TRACE_EVENT_TRACE_EVENT_MEMORY_H_
+#define BASE_TRACE_EVENT_TRACE_EVENT_MEMORY_H_
#include "base/base_export.h"
-#include "base/debug/trace_event_impl.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
+#include "base/trace_event/trace_event_impl.h"
// TODO(jamescook): Windows support for memory tracing.
#if !defined(NO_TCMALLOC) && !defined(OS_NACL) && \
@@ -169,4 +169,4 @@ BASE_EXPORT const char* StringFromHexAddress(const std::string& hex_address);
// visualizer skips them. Must match the value in heap.js.
#define TRACE_MEMORY_IGNORE "trace-memory-ignore"
-#endif // BASE_DEBUG_TRACE_EVENT_MEMORY_H_
+#endif // BASE_TRACE_EVENT_TRACE_EVENT_MEMORY_H_
« no previous file with comments | « base/trace_event/trace_event_impl_constants.cc ('k') | base/trace_event/trace_event_memory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698