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

extensions/test/extensions_unittests_main.cc

Index: extensions/test/extensions_unittests_main.cc
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc
index aa0108f9d4b994b54fb4efbeee65b038c190962e..e8e8ef001456bc91be1d8719562612c86eac4596 100644
--- a/extensions/test/extensions_unittests_main.cc
+++ b/extensions/test/extensions_unittests_main.cc
@@ -16,6 +16,7 @@
 #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 {
 
@@ -30,11 +31,15 @@ class ExtensionsContentClient : public content::ContentClient {
 
   // content::ContentClient overrides:
   void AddAdditionalSchemes(
-      std::vector<std::string>* standard_schemes,
+      std::vector<url::SchemeWithType>* standard_schemes,
       std::vector<std::string>* savable_schemes) override {
-    standard_schemes->push_back(extensions::kExtensionScheme);
+    standard_schemes->push_back(
+        url::SchemeWithType(extensions::kExtensionScheme,
+                            url::SCHEME_WITHOUT_PORT));
     savable_schemes->push_back(extensions::kExtensionScheme);
-    standard_schemes->push_back(extensions::kExtensionResourceScheme);
+    standard_schemes->push_back(
+        url::SchemeWithType(extensions::kExtensionResourceScheme,
+                            url::SCHEME_WITHOUT_PORT));
     savable_schemes->push_back(extensions::kExtensionResourceScheme);
   }