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

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

index 0f3b95e04810f8b0e8270b130956d37ea79c3056..dd91d09c1169f0b9db21e51a07ad37c18147eeb6 100644

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

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

@@ -91,8 +91,7 @@ bool ParsePhishingUrls(const std::string& data,

<< urls[i];

return false;

}

- phishing_url.url = std::string(content::kHttpScheme) +

- "://" + record_parts[0];

+ phishing_url.url = std::string(url::kHttpScheme) + "://" + record_parts[0];

phishing_url.list_name = record_parts[1];

if (record_parts[2] == "yes") {

phishing_url.is_phishing = true;