Add suborigin logic to url::Origin

content/browser/child_process_security_policy_impl.cc

Index: content/browser/child_process_security_policy_impl.cc
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index d7fd241f5adebd7b7f10cad5bd52e6018fda1be0..f1aa1c74d71df72530020a7be37b54ab32fee7f7 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -344,8 +344,8 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
   RegisterPseudoScheme(url::kAboutScheme);
   RegisterPseudoScheme(url::kJavaScriptScheme);
   RegisterPseudoScheme(kViewSourceScheme);
-  RegisterPseudoScheme(kHttpSuboriginScheme);
-  RegisterPseudoScheme(kHttpsSuboriginScheme);
+  RegisterPseudoScheme(url::kHttpSuboriginScheme);
+  RegisterPseudoScheme(url::kHttpsSuboriginScheme);
 }
 
 ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
@@ -711,8 +711,8 @@ bool ChildProcessSecurityPolicyImpl::CanSetAsOriginHeader(int child_id,
     return false;  // Can't set invalid URLs as origin headers.
 
   // Suborigin URLs are a special case and are allowed to be an origin header.
-  if (url.scheme() == kHttpSuboriginScheme ||
-      url.scheme() == kHttpsSuboriginScheme) {
+  if (url.scheme() == url::kHttpSuboriginScheme ||
+      url.scheme() == url::kHttpsSuboriginScheme) {
     DCHECK(IsPseudoScheme(url.scheme()));
     return true;
   }