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

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 5fc72b7195198b132668b06406fae00ee1cc0c64..58cbb98f442630833d686e565cbba534e5cc21a0 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -412,19 +412,31 @@ void ChromeContentClient::AddPepperPlugins(
 }
 
 void ChromeContentClient::AddAdditionalSchemes(
-    std::vector<std::string>* standard_schemes,
+    std::vector<url::SchemeWithType>* standard_schemes,
     std::vector<std::string>* savable_schemes) {
-  standard_schemes->push_back(extensions::kExtensionScheme);
+  standard_schemes->push_back(
+      url::SchemeWithType(extensions::kExtensionScheme,
+                          url::SCHEME_WITHOUT_PORT));
   savable_schemes->push_back(extensions::kExtensionScheme);
-  standard_schemes->push_back(chrome::kChromeNativeScheme);
-  standard_schemes->push_back(extensions::kExtensionResourceScheme);
+  standard_schemes->push_back(
+      url::SchemeWithType(chrome::kChromeNativeScheme,
+                          url::SCHEME_WITHOUT_PORT));
+  standard_schemes->push_back(
+      url::SchemeWithType(extensions::kExtensionResourceScheme,
+                          url::SCHEME_WITHOUT_PORT));
   savable_schemes->push_back(extensions::kExtensionResourceScheme);
-  standard_schemes->push_back(chrome::kChromeSearchScheme);
+  standard_schemes->push_back(
+      url::SchemeWithType(chrome::kChromeSearchScheme,
+                          url::SCHEME_WITHOUT_PORT));
   savable_schemes->push_back(chrome::kChromeSearchScheme);
-  standard_schemes->push_back(dom_distiller::kDomDistillerScheme);
+  standard_schemes->push_back(
+      url::SchemeWithType(dom_distiller::kDomDistillerScheme,
+                          url::SCHEME_WITHOUT_PORT));
   savable_schemes->push_back(dom_distiller::kDomDistillerScheme);
 #if defined(OS_CHROMEOS)
-  standard_schemes->push_back(chrome::kCrosScheme);
+  standard_schemes->push_back(
+      url::SchemeWithType(chrome::kCrosScheme,
+                          url::SCHEME_WITHOUT_PORT));
 #endif
 }