Allow url::SchemeHostPort to hold non-file scheme without port

content/common/url_schemes.cc

Index: content/common/url_schemes.cc
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
index c65bb14562de2f2c0f182c6882bc9d9d808e4205..26fee9383311bf03a3dd87c263167d5cfb1df1f8 100644
--- a/content/common/url_schemes.cc
+++ b/content/common/url_schemes.cc
@@ -19,8 +19,8 @@
 
 namespace {
 
-void AddStandardSchemeHelper(const std::string& scheme) {
-  url::AddStandardScheme(scheme.c_str());
+void AddStandardSchemeHelper(const url::SchemeWithType& scheme) {
+  url::AddStandardScheme(scheme.scheme, scheme.type);
 }
 
 }  // namespace
@@ -28,15 +28,15 @@ void AddStandardSchemeHelper(const std::string& scheme) {
 namespace content {
 
 void RegisterContentSchemes(bool lock_standard_schemes) {
-  std::vector<std::string> additional_standard_schemes;
+  std::vector<url::SchemeWithType> additional_standard_schemes;
   std::vector<std::string> additional_savable_schemes;
   GetContentClient()->AddAdditionalSchemes(&additional_standard_schemes,
                                            &additional_savable_schemes);
 
-  url::AddStandardScheme(kChromeDevToolsScheme);
-  url::AddStandardScheme(kChromeUIScheme);
-  url::AddStandardScheme(kGuestScheme);
-  url::AddStandardScheme(kMetadataScheme);
+  url::AddStandardScheme(kChromeDevToolsScheme, url::SCHEME_WITHOUT_PORT);
+  url::AddStandardScheme(kChromeUIScheme, url::SCHEME_WITHOUT_PORT);
+  url::AddStandardScheme(kGuestScheme, url::SCHEME_WITHOUT_PORT);
+  url::AddStandardScheme(kMetadataScheme, url::SCHEME_WITHOUT_AUTHORITY);
   std::for_each(additional_standard_schemes.begin(),
                 additional_standard_schemes.end(),
                 AddStandardSchemeHelper);