components/metrics/call_stack_profile_metrics_provider.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: components/metrics/call_stack_profile_metrics_provider.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 blank lines 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

« chromecast/media/base/media_message_loop.h ('K') | « components/keyed_service/ios/browser_state_dependency_manager.cc ('k') | components/nacl/browser/nacl_broker_service_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/metrics/call_stack_profile_metrics_provider.cc

diff --git a/components/metrics/call_stack_profile_metrics_provider.cc b/components/metrics/call_stack_profile_metrics_provider.cc

index b4d6afe5719f70bffeb09293208a20dd970299c9..15840e9622919e8a454740d5942c0eb3535e8912 100644

--- a/components/metrics/call_stack_profile_metrics_provider.cc

+++ b/components/metrics/call_stack_profile_metrics_provider.cc

@@ -95,7 +95,7 @@ class PendingProfiles {

void ResetToDefaultStateForTesting();

private:

- friend struct DefaultSingletonTraits<PendingProfiles>;

+ friend struct base::DefaultSingletonTraits<PendingProfiles>;

PendingProfiles();

~PendingProfiles();

@@ -119,8 +119,8 @@ class PendingProfiles {

// static

PendingProfiles* PendingProfiles::GetInstance() {

// Leaky for performance rather than correctness reasons.

- return Singleton<PendingProfiles,

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

+ return base::Singleton<PendingProfiles,

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

}

void PendingProfiles::Clear() {