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 0eb5ade6f4a3f8cbe8d310556ae4a064c2d100ae..78ac2e41ff3d94523c3b39933f973cd77fc8e793 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -339,8 +339,8 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
   RegisterPseudoScheme(url::kAboutScheme);
   RegisterPseudoScheme(url::kJavaScriptScheme);
   RegisterPseudoScheme(kViewSourceScheme);
-  RegisterPseudoScheme(kHttpSuboriginScheme);
-  RegisterPseudoScheme(kHttpsSuboriginScheme);
+  RegisterPseudoScheme(url::kHttpSuboriginScheme);
+  RegisterPseudoScheme(url::kHttpsSuboriginScheme);
 }
 
 ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
@@ -706,8 +706,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;
   }