chrome/browser/safe_browsing/safe_browsing_service.cc - Issue 1402783005: Remove safe_browsing=2 functionality, replace with =3 mode.

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

Issue 1402783005: Remove safe_browsing=2 functionality, replace with =3 mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix up histograms Created 5 years, 2 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

« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_database.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_service.cc

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

index fc2f2ed31bf79578fc232cefeb1eda929adca5df..d1c86945302de8b1bf0da1e0c87f28a9d24c63e3 100644

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

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

@@ -251,12 +251,8 @@ void SafeBrowsingService::Initialize() {

}

#endif // defined(SAFE_BROWSING_CSD)

-// TODO(nparker): Adding SAFE_BROWSING_SERVICE_DOWNLOAD to control this might

-// allow removing FULL_SAFE_BROWSING above.

-#if !defined(OS_ANDROID)

download_service_.reset(new safe_browsing::DownloadProtectionService(

this, url_request_context_getter_.get()));

-#endif

if (safe_browsing::IncidentReportingService::IsEnabled()) {

incident_service_.reset(new safe_browsing::IncidentReportingService(