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

url/url_util_unittest.cc

 // 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.
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/third_party/mozilla/url_parse.h"
 #include "url/url_canon.h"
 #include "url/url_canon_stdstring.h"
 #include "url/url_test_utils.h"
@@ skipping 43 matching lines @@
 
   // Control characters should be stripped out on the ends, and kept in the
   // middle.
   const char ctrl_str[] = "\02jav\02scr\03ipt:alert(1)";
   EXPECT_FALSE(FindAndCompareScheme(ctrl_str,
                                     static_cast<int>(strlen(ctrl_str)),
                                     "javascript", &found_scheme));
   EXPECT_TRUE(found_scheme == Component(1, 11));
 }
 
-TEST(URLUtilTest, IsStandard) {
-  const char kHTTPScheme[] = "http";
-  EXPECT_TRUE(IsStandard(kHTTPScheme, Component(0, strlen(kHTTPScheme))));
-
-  const char kFooScheme[] = "foo";
-  EXPECT_FALSE(IsStandard(kFooScheme, Component(0, strlen(kFooScheme))));
-}
-
-TEST(URLUtilTest, GetStandardSchemeType) {
-  url::SchemeType scheme_type;
-
-  const char kHTTPScheme[] = "http";
-  scheme_type = url::SCHEME_WITHOUT_AUTHORITY;
-  EXPECT_TRUE(GetStandardSchemeType(kHTTPScheme,
-                                    Component(0, strlen(kHTTPScheme)),
-                                    &scheme_type));
-  EXPECT_EQ(url::SCHEME_WITH_PORT, scheme_type);
-
-  const char kFilesystemScheme[] = "filesystem";
-  scheme_type = url::SCHEME_WITH_PORT;
-  EXPECT_TRUE(GetStandardSchemeType(kFilesystemScheme,
-                                    Component(0, strlen(kFilesystemScheme)),
-                                    &scheme_type));
-  EXPECT_EQ(url::SCHEME_WITHOUT_AUTHORITY, scheme_type);
-
-  const char kFooScheme[] = "foo";
-  scheme_type = url::SCHEME_WITH_PORT;
-  EXPECT_FALSE(GetStandardSchemeType(kFooScheme,
-                                     Component(0, strlen(kFooScheme)),
-                                     &scheme_type));
-}
-
 TEST(URLUtilTest, ReplaceComponents) {
   Parsed parsed;
   RawCanonOutputT<char> output;
   Parsed new_parsed;
 
   // Check that the following calls do not cause crash
   Replacements<char> replacements;
   replacements.SetRef("test", Component(0, 4));
   ReplaceComponents(NULL, 0, parsed, replacements, NULL, &output, &new_parsed);
   ReplaceComponents("", 0, parsed, replacements, NULL, &output, &new_parsed);
@@ skipping 139 matching lines @@
   for (size_t i = 0; i < arraysize(encode_cases); i++) {
     const char* input = encode_cases[i].input;
     RawCanonOutputT<char> buffer;
     EncodeURIComponent(input, strlen(input), &buffer);
     std::string output(buffer.data(), buffer.length());
     EXPECT_EQ(encode_cases[i].output, output);
   }
 }
 
 TEST(URLUtilTest, TestResolveRelativeWithNonStandardBase) {
-  // This tests non-standard (in the sense that IsStandard() == false)
+  // This tests non-standard (in the sense that GIsStandard() == false)
   // hierarchical schemes.
   struct ResolveRelativeCase {
     const char* base;
     const char* rel;
     bool is_valid;
     const char* out;
   } resolve_non_standard_cases[] = {
       // Resolving a relative path against a non-hierarchical URL should fail.
     {"scheme:opaque_data", "/path", false, ""},
       // Resolving a relative path against a non-standard authority-based base
@@ skipping 85 matching lines @@
 
   bool valid = ResolveRelative(base, strlen(base),
                                base_parsed, rel,
                                strlen(rel), NULL, &output,
                                &resolved_parsed);
   EXPECT_TRUE(valid);
   EXPECT_FALSE(resolved_parsed.ref.is_valid());
 }
 
 }  // namespace url