Revert of 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"
 
 #if defined(OS_LINUX)
 #include <fcntl.h>
 #endif  // defined(OS_LINUX)
 
@@ skipping 490 matching lines @@
     flash_versions.push_back(system_flash.release());
 
   // This function will return only the most recent version of the flash plugin.
   content::PepperPluginInfo* max_flash =
       FindMostRecentPlugin(flash_versions.get());
   if (max_flash != nullptr)
     plugins->push_back(*max_flash);
 #endif  // defined(ENABLE_PLUGINS)
 }
 
+void ChromeContentClient::AddAdditionalSchemes(
+    std::vector<std::string>* standard_schemes,
+    std::vector<std::string>* savable_schemes) {
+  standard_schemes->push_back(extensions::kExtensionScheme);
+  savable_schemes->push_back(extensions::kExtensionScheme);
+  standard_schemes->push_back(chrome::kChromeNativeScheme);
+  standard_schemes->push_back(extensions::kExtensionResourceScheme);
+  savable_schemes->push_back(extensions::kExtensionResourceScheme);
+  standard_schemes->push_back(chrome::kChromeSearchScheme);
+  savable_schemes->push_back(chrome::kChromeSearchScheme);
+  standard_schemes->push_back(dom_distiller::kDomDistillerScheme);
+  savable_schemes->push_back(dom_distiller::kDomDistillerScheme);
 #if defined(OS_CHROMEOS)
-static const int kNumChromeStandardURLSchemes = 6;
-#else
-static const int kNumChromeStandardURLSchemes = 5;
+  standard_schemes->push_back(chrome::kCrosScheme);
 #endif
-static const url::SchemeWithType kChromeStandardURLSchemes[
-    kNumChromeStandardURLSchemes] = {
-  {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT},
-  {chrome::kChromeNativeScheme, url::SCHEME_WITHOUT_PORT},
-  {extensions::kExtensionResourceScheme, url::SCHEME_WITHOUT_PORT},
-  {chrome::kChromeSearchScheme, url::SCHEME_WITHOUT_PORT},
-  {dom_distiller::kDomDistillerScheme, url::SCHEME_WITHOUT_PORT},
-#if defined(OS_CHROMEOS)
-  {chrome::kCrosScheme, url::SCHEME_WITHOUT_PORT},
-#endif
-};
-
-void ChromeContentClient::AddAdditionalSchemes(
-    std::vector<url::SchemeWithType>* standard_schemes,
-    std::vector<std::string>* savable_schemes) {
-  for (int i = 0; i < kNumChromeStandardURLSchemes; i++)
-    standard_schemes->push_back(kChromeStandardURLSchemes[i]);
-
-  savable_schemes->push_back(extensions::kExtensionScheme);
-  savable_schemes->push_back(extensions::kExtensionResourceScheme);
-  savable_schemes->push_back(chrome::kChromeSearchScheme);
-  savable_schemes->push_back(dom_distiller::kDomDistillerScheme);
 }
 
 std::string ChromeContentClient::GetProduct() const {
   return ::GetProduct();
 }
 
 std::string ChromeContentClient::GetUserAgent() const {
   return ::GetUserAgent();
 }
 
@@ skipping 53 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);
 }