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

extensions/test/extensions_unittests_main.cc

 // Copyright 2014 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/base_paths.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "content/public/common/content_client.h"
 #include "content/public/test/content_test_suite_base.h"
 #include "content/public/test/unittest_test_suite.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/test/test_extensions_client.h"
 #include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gl/test/gl_surface_test_support.h"
-#include "url/url_util.h"
 
 namespace {
 
-const int kNumExtensionStandardURLSchemes = 2;
-const url::SchemeWithType kExtensionStandardURLSchemes[
-    kNumExtensionStandardURLSchemes] = {
-  {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT},
-  {extensions::kExtensionResourceScheme, url::SCHEME_WITHOUT_PORT},
-};
-
 // Content client that exists only to register chrome-extension:// scheme with
 // the url module.
 // TODO(jamescook): Should this be merged with ShellContentClient? Should this
 // be a persistent object available to tests?
 class ExtensionsContentClient : public content::ContentClient {
  public:
   ExtensionsContentClient() {}
   ~ExtensionsContentClient() override {}
 
   // content::ContentClient overrides:
   void AddAdditionalSchemes(
-      std::vector<url::SchemeWithType>* standard_schemes,
+      std::vector<std::string>* standard_schemes,
       std::vector<std::string>* savable_schemes) override {
-    for (int i = 0; i < kNumExtensionStandardURLSchemes; i++)
-      standard_schemes->push_back(kExtensionStandardURLSchemes[i]);
-
+    standard_schemes->push_back(extensions::kExtensionScheme);
     savable_schemes->push_back(extensions::kExtensionScheme);
+    standard_schemes->push_back(extensions::kExtensionResourceScheme);
     savable_schemes->push_back(extensions::kExtensionResourceScheme);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionsContentClient);
 };
 
 // The test suite for extensions_unittests.
 class ExtensionsTestSuite : public content::ContentTestSuiteBase {
  public:
@@ skipping 52 matching lines @@
 
 int main(int argc, char** argv) {
   content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv));
 
   mojo::embedder::test::InitWithSimplePlatformSupport();
   return base::LaunchUnitTests(argc,
                                argv,
                                base::Bind(&content::UnitTestTestSuite::Run,
                                           base::Unretained(&test_suite)));
 }