chrome/browser/safe_browsing/srt_fetcher_win.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: chrome/browser/safe_browsing/srt_fetcher_win.cc

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

Patch Set: Fix more errors 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_log.cc ('K') | « chrome/browser/recovery/recovery_install_global_error_factory.cc ('k') | chrome/browser/search/hotword_service_factory.h » ('j') | ios/chrome/browser/favicon/favicon_service_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/srt_fetcher_win.cc

diff --git a/chrome/browser/safe_browsing/srt_fetcher_win.cc b/chrome/browser/safe_browsing/srt_fetcher_win.cc

index 9a9a8a3c6d2a092a090c990213d24d0f663f878e..e6dc9391756d1775a543a1ee50605af3f3243db6 100644

--- a/chrome/browser/safe_browsing/srt_fetcher_win.cc

+++ b/chrome/browser/safe_browsing/srt_fetcher_win.cc

@@ -155,8 +155,8 @@ class SRTFetcher : public net::URLFetcherDelegate {

class ReporterRunner : public chrome::BrowserListObserver {

public:

static ReporterRunner* GetInstance() {

- return Singleton<ReporterRunner,

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

+ return base::Singleton<ReporterRunner,

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

}

// Starts the sequence of attempts to run the reporter.

@@ -168,7 +168,7 @@ class ReporterRunner : public chrome::BrowserListObserver {

}

private:

- friend struct DefaultSingletonTraits<ReporterRunner>;

+ friend struct base::DefaultSingletonTraits<ReporterRunner>;

ReporterRunner() {}

~ReporterRunner() override {}