base/trace_event/trace_event_synthetic_delay.h - 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_synthetic_delay.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:

Index: base/trace_event/trace_event_synthetic_delay.h

diff --git a/base/debug/trace_event_synthetic_delay.h b/base/trace_event/trace_event_synthetic_delay.h

similarity index 96%

copy from base/debug/trace_event_synthetic_delay.h

copy to base/trace_event/trace_event_synthetic_delay.h

index 06d6cdea1f98b7125ba9f64248a5fe5bfd28a9d8..b52f3b05534c81ec5f4df2a68f9927515f1ce257 100644

--- a/base/debug/trace_event_synthetic_delay.h

+++ b/base/trace_event/trace_event_synthetic_delay.h

@@ -29,13 +29,13 @@

// Note that a single delay may begin on one thread and end on another. This

// implies that a single delay cannot not be applied in several threads at once.

-#ifndef BASE_DEBUG_TRACE_EVENT_SYNTHETIC_DELAY_H_

-#define BASE_DEBUG_TRACE_EVENT_SYNTHETIC_DELAY_H_

+#ifndef BASE_TRACE_EVENT_TRACE_EVENT_SYNTHETIC_DELAY_H_

+#define BASE_TRACE_EVENT_TRACE_EVENT_SYNTHETIC_DELAY_H_

#include "base/atomicops.h"

-#include "base/debug/trace_event.h"

#include "base/synchronization/lock.h"

#include "base/time/time.h"

+#include "base/trace_event/trace_event.h"

// Apply a named delay in the current scope.

#define TRACE_EVENT_SYNTHETIC_DELAY(name) \

@@ -163,4 +163,4 @@ TRACE_EVENT_API_CLASS_EXPORT base::debug::TraceEventSyntheticDelay*

} // namespace trace_event_internal

-#endif /* BASE_DEBUG_TRACE_EVENT_SYNTHETIC_DELAY_H_ */

+#endif /* BASE_TRACE_EVENT_TRACE_EVENT_SYNTHETIC_DELAY_H_ */