chrome/browser/chromeos/attestation/platform_verification_flow.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/chromeos/attestation/platform_verification_flow.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/chromeos/attestation/platform_verification_flow.cc

diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc

index 1c31f9161071a616b87e738e2db420bd5fd039fd..0adda1276f450120fbac7e094f649349bf9952c4 100644

--- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc

+++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc

@@ -445,9 +445,9 @@ void PlatformVerificationFlow::RecordDomainConsent(

->WithPathWildcard();

if (!url.port().empty())

builder->WithPort(url.port());

- else if (url.SchemeIs(content::kHttpsScheme))

+ else if (url.SchemeIs(url::kHttpsScheme))

builder->WithPort(kDefaultHttpsPort);

- else if (url.SchemeIs(content::kHttpScheme))

+ else if (url.SchemeIs(url::kHttpScheme))

builder->WithPortWildcard();

ContentSettingsPattern pattern = builder->Build();

if (pattern.IsValid()) {