chrome/browser/safe_browsing/database_manager.cc - Issue 254763005: Move some content url constants to /url.

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

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve a merge conflict. Created 6 years, 7 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: chrome/browser/safe_browsing/database_manager.cc

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

index 6af40543fdd225d5c0ca5ade243866185d5bf92b..7fe23c256bed78e9f18d5d287be9327a950dd463 100644

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

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

@@ -222,8 +222,8 @@ SafeBrowsingDatabaseManager::~SafeBrowsingDatabaseManager() {

bool SafeBrowsingDatabaseManager::CanCheckUrl(const GURL& url) const {

return url.SchemeIs(content::kFtpScheme) ||

- url.SchemeIs(content::kHttpScheme) ||

- url.SchemeIs(content::kHttpsScheme);

+ url.SchemeIs(url::kHttpScheme) ||

+ url.SchemeIs(url::kHttpsScheme);

}

bool SafeBrowsingDatabaseManager::CheckDownloadUrl(