chrome/browser/extensions/api/cookies/cookies_helpers.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/extensions/api/cookies/cookies_helpers.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/extensions/api/cookies/cookies_helpers.cc

diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc

index 750bd1e6aed0d001a89a264b92ce90d9bb508d96..2a26d32630febffc8b2270c16ac1f211db67e18f 100644

--- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc

+++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc

@@ -120,7 +120,7 @@ void GetCookieListFromStore(

GURL GetURLFromCanonicalCookie(const net::CanonicalCookie& cookie) {

const std::string& domain_key = cookie.Domain();

const std::string scheme =

- cookie.IsSecure() ? content::kHttpsScheme : content::kHttpScheme;

+ cookie.IsSecure() ? url::kHttpsScheme : url::kHttpScheme;

const std::string host =

domain_key.find('.') != 0 ? domain_key : domain_key.substr(1);

return GURL(scheme + content::kStandardSchemeSeparator + host + "/");