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

chrome/common/chrome_content_client.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 "chrome/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 394 matching lines @@
 
   content::PepperPluginInfo plugin;
   if (GetBundledPepperFlash(&plugin))
     plugins->push_back(plugin);
   if (GetSystemPepperFlash(&plugin))
     plugins->push_back(plugin);
 #endif
 }
 
 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
 }
 
 std::string ChromeContentClient::GetProduct() const {
   return ::GetProduct();
 }
 
 std::string ChromeContentClient::GetUserAgent() const {
   return ::GetUserAgent();
 }
@@ skipping 54 matching lines @@
   schemes->insert(content::kChromeUIScheme);
   schemes->insert(extensions::kExtensionScheme);
   schemes->insert(extensions::kExtensionResourceScheme);
   GetSecureOriginWhitelist(origins);
 }
 
 void ChromeContentClient::AddServiceWorkerSchemes(
     std::set<std::string>* schemes) {
   schemes->insert(extensions::kExtensionScheme);
 }