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

Unified Diff: base/trace_event/trace_event_memory_unittest.cc

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_memory.cc ('k') | base/trace_event/trace_event_synthetic_delay.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/trace_event_memory_unittest.cc
diff --git a/base/debug/trace_event_memory_unittest.cc b/base/trace_event/trace_event_memory_unittest.cc
similarity index 98%
rename from base/debug/trace_event_memory_unittest.cc
rename to base/trace_event/trace_event_memory_unittest.cc
index 12135b81c3abe29f74ab882938d5c9ef741ee824..220c0e6215a2a15ab8d57c68e31ea71508a8f23e 100644
--- a/base/debug/trace_event_memory_unittest.cc
+++ b/base/trace_event/trace_event_memory_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/debug/trace_event_memory.h"
+#include "base/trace_event/trace_event_memory.h"
#include <sstream>
#include <string>
-#include "base/debug/trace_event_impl.h"
#include "base/message_loop/message_loop.h"
+#include "base/trace_event/trace_event_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
« no previous file with comments | « base/trace_event/trace_event_memory.cc ('k') | base/trace_event/trace_event_synthetic_delay.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698