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

url/url_util.h

 // Copyright 2013 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.
 
 #ifndef URL_URL_UTIL_H_
 #define URL_URL_UTIL_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
@@ skipping 19 matching lines @@
 URL_EXPORT void Initialize();
 
 // Cleanup is not required, except some strings may leak. For most user
 // applications, this is fine. If you're using it in a library that may get
 // loaded and unloaded, you'll want to unload to properly clean up your
 // library.
 URL_EXPORT void Shutdown();
 
 // Schemes --------------------------------------------------------------------
 
-// Types of a scheme representing the requirements on the data represented by
-// the authority component of a URL with the scheme.
-enum URL_EXPORT SchemeType {
-  // The authority component of a URL with the scheme, if any, has the port
-  // (the default values may be omitted in a serialization).
-  SCHEME_WITH_PORT,
-  // The authority component of a URL with the scheme, if any, doesn't have a
-  // port.
-  SCHEME_WITHOUT_PORT,
-  // A URL with the scheme doesn't have the authority component.
-  SCHEME_WITHOUT_AUTHORITY,
-};
-
-// A pair for representing a standard scheme name and the SchemeType for it.
-struct URL_EXPORT SchemeWithType {
-  const char* scheme;
-  SchemeType type;
-};
-
 // Adds an application-defined scheme to the internal list of "standard-format"
 // URL schemes. A standard-format scheme adheres to what RFC 3986 calls "generic
 // URI syntax" (https://tools.ietf.org/html/rfc3986#section-3).
 //
 // This function is not threadsafe and can not be called concurrently with any
 // other url_util function. It will assert if the list of standard schemes has
 // been locked (see LockStandardSchemes).
-URL_EXPORT void AddStandardScheme(const char* new_scheme,
-                                  SchemeType scheme_type);
+URL_EXPORT void AddStandardScheme(const char* new_scheme);
 
 // Sets a flag to prevent future calls to AddStandardScheme from succeeding.
 //
 // This is designed to help prevent errors for multithreaded applications.
 // Normal usage would be to call AddStandardScheme for your custom schemes at
 // the beginning of program initialization, and then LockStandardSchemes. This
 // prevents future callers from mistakenly calling AddStandardScheme when the
 // program is running with multiple threads, where such usage would be
 // dangerous.
 //
@@ skipping 22 matching lines @@
   return FindAndCompareScheme(str.data(), static_cast<int>(str.size()),
                               compare, found_scheme);
 }
 inline bool FindAndCompareScheme(const base::string16& str,
                                  const char* compare,
                                  Component* found_scheme) {
   return FindAndCompareScheme(str.data(), static_cast<int>(str.size()),
                               compare, found_scheme);
 }
 
-// Returns true if the given scheme identified by |scheme| within |spec| is in
-// the list of known standard-format schemes (see AddStandardScheme).
+// Returns true if the given string represents a URL whose scheme is in the list
+// of known standard-format schemes (see AddStandardScheme).
 URL_EXPORT bool IsStandard(const char* spec, const Component& scheme);
 URL_EXPORT bool IsStandard(const base::char16* spec, const Component& scheme);
 
-// Returns true and sets |type| to the SchemeType of the given scheme
-// identified by |scheme| within |spec| if the scheme is in the list of known
-// standard-format schemes (see AddStandardScheme).
-URL_EXPORT bool GetStandardSchemeType(const char* spec,
-                                      const Component& scheme,
-                                      SchemeType* type);
-
 // URL library wrappers -------------------------------------------------------
 
 // Parses the given spec according to the extracted scheme type. Normal users
 // should use the URL object, although this may be useful if performance is
 // critical and you don't want to do the heap allocation for the std::string.
 //
 // As with the Canonicalize* functions, the charset converter can
 // be NULL to use UTF-8 (it will be faster in this case).
 //
 // Returns true if a valid URL was produced, false if not. On failure, the
@@ skipping 68 matching lines @@
 
 // Escapes the given string as defined by the JS method encodeURIComponent. See
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/encodeURIComponent
 URL_EXPORT void EncodeURIComponent(const char* input,
                                    int length,
                                    CanonOutput* output);
 
 }  // namespace url
 
 #endif  // URL_URL_UTIL_H_