base/trace_event/trace_event_synthetic_delay.cc - Issue 1308823002: Move Singleton and related structs to namespace base

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.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add \n Created 5 years, 4 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

« base/trace_event/trace_event_etw_export_win.h ('K') | « base/trace_event/trace_event_etw_export_win.cc ('k') | base/trace_event/trace_event_win.h » ('j') | base/trace_event/trace_event_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/trace_event/trace_event_synthetic_delay.cc

diff --git a/base/trace_event/trace_event_synthetic_delay.cc b/base/trace_event/trace_event_synthetic_delay.cc

index bad79ccbc8c27a826a951051b77bfc2ef0ed6e4c..7d37f29dabb793cafbcc0803c26ee14e2fefdec2 100644

--- a/base/trace_event/trace_event_synthetic_delay.cc

+++ b/base/trace_event/trace_event_synthetic_delay.cc

@@ -29,7 +29,7 @@ class TraceEventSyntheticDelayRegistry : public TraceEventSyntheticDelayClock {

private:

TraceEventSyntheticDelayRegistry();

- friend struct DefaultSingletonTraits<TraceEventSyntheticDelayRegistry>;

+ friend struct base::DefaultSingletonTraits<TraceEventSyntheticDelayRegistry>;

Lock lock_;

TraceEventSyntheticDelay delays_[kMaxSyntheticDelays];

@@ -149,9 +149,9 @@ void TraceEventSyntheticDelay::ApplyDelay(base::TimeTicks end_time) {

TraceEventSyntheticDelayRegistry*

TraceEventSyntheticDelayRegistry::GetInstance() {

- return Singleton<

+ return base::Singleton<

TraceEventSyntheticDelayRegistry,

- LeakySingletonTraits<TraceEventSyntheticDelayRegistry> >::get();

+ base::LeakySingletonTraits<TraceEventSyntheticDelayRegistry> >::get();

}

TraceEventSyntheticDelayRegistry::TraceEventSyntheticDelayRegistry()