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

components/test/run_all_unittests.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 "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
@@ skipping 60 matching lines @@
     base::FilePath ui_test_pak_path;
     ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
     ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
 
     ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
         pak_path.AppendASCII("components_tests_resources.pak"),
         ui::SCALE_FACTOR_NONE);
 
     // These schemes need to be added globally to pass tests of
     // autocomplete_input_unittest.cc and content_settings_pattern*
-    url::AddStandardScheme("chrome", url::SCHEME_WITHOUT_PORT);
-    url::AddStandardScheme("chrome-extension", url::SCHEME_WITHOUT_PORT);
-    url::AddStandardScheme("chrome-devtools", url::SCHEME_WITHOUT_PORT);
-    url::AddStandardScheme("chrome-search", url::SCHEME_WITHOUT_PORT);
+    url::AddStandardScheme("chrome");
+    url::AddStandardScheme("chrome-extension");
+    url::AddStandardScheme("chrome-devtools");
+    url::AddStandardScheme("chrome-search");
 
     // Not using kExtensionScheme to avoid the dependency to extensions.
     ContentSettingsPattern::SetNonWildcardDomainNonPortScheme(
         "chrome-extension");
   }
 
   void Shutdown() override {
     ui::ResourceBundle::CleanupSharedInstance();
 
     base::TestSuite::Shutdown();
@@ skipping 29 matching lines @@
   // The listener will set up common test environment for all components unit
   // tests.
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new ComponentsUnitTestEventListener());
 
   return base::LaunchUnitTests(
       argc, argv, base::Bind(&base::TestSuite::Run,
                              base::Unretained(&test_suite)));
 }