Updated suborigin serialization to latest spec proposal

content/common/url_schemes.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/url_schemes.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 17 matching lines @@
   std::vector<std::string> additional_savable_schemes;
 
   GetContentClient()->AddAdditionalSchemes(&additional_standard_schemes,
                                            &additional_referrer_schemes,
                                            &additional_savable_schemes);
 
   url::AddStandardScheme(kChromeDevToolsScheme, url::SCHEME_WITHOUT_PORT);
   url::AddStandardScheme(kChromeUIScheme, url::SCHEME_WITHOUT_PORT);
   url::AddStandardScheme(kGuestScheme, url::SCHEME_WITHOUT_PORT);
 
+  url::AddStandardScheme(kHttpSuboriginScheme, url::SCHEME_WITH_PORT);

[nasko, 2016/09/22 23:53:42]

What breaks if we don't add it as a standard scheme?

[jww, 2016/09/23 04:12:44]

This is more important for KURL parsing. I'll have to dig down to recall exactly
why, but KURL won't parse the URLs correctly if the scheme isn't "standard".

[jww, 2016/09/23 16:33:48]

Just digging a little further through my memory here, I believe that KURL will
only treat a URL as hierarchical if the scheme is listed as a standard scheme. I
believe there are a couple of other IsStandard checks as well, but that's the
one I was consistently running into.

[nasko, 2016/09/23 21:59:48]

Hmm, why would KURL depend on content/? This is very much backwards in terms of
layering. However, it is indeed the case because content/ populates url::'s view
of what is a standard scheme and KURL uses url:: ... Fun!

+  url::AddReferrerScheme(kHttpSuboriginScheme, url::SCHEME_WITH_PORT);
+  url::AddStandardScheme(kHttpsSuboriginScheme, url::SCHEME_WITH_PORT);
+  url::AddReferrerScheme(kHttpsSuboriginScheme, url::SCHEME_WITH_PORT);
+
   for (const url::SchemeWithType& scheme : additional_standard_schemes)
     url::AddStandardScheme(scheme.scheme, scheme.type);
 
   for (const url::SchemeWithType& scheme : additional_referrer_schemes)
     url::AddReferrerScheme(scheme.scheme, scheme.type);
 
   // Prevent future modification of the scheme lists. This is to prevent
   // accidental creation of data races in the program. Add*Scheme aren't
   // threadsafe so must be called when GURL isn't used on any other thread. This
   // is really easy to mess up, so we say that all calls to Add*Scheme in Chrome
@@ skipping 20 matching lines @@
       savable_schemes[default_schemes_count + i] =
           base::strdup(additional_savable_schemes[i].c_str());
     }
     savable_schemes[default_schemes_count + schemes] = 0;
 
     SetSavableSchemes(savable_schemes);
   }
 }
 
 }  // namespace content