base/trace_event/trace_event_memory_unittest.cc - Issue 885443002: Roll Chrome into Mojo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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)