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..f39e40dd92e8a4f698a92531cad51b61404ed2ed 100644
--- a/extensions/test/extensions_unittests_main.cc
+++ b/extensions/test/extensions_unittests_main.cc
@@ -16,9 +16,17 @@
 #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
@@ -30,11 +38,12 @@ 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);
+    for (int i = 0; i < kNumExtensionStandardURLSchemes; i++)
+      standard_schemes->push_back(kExtensionStandardURLSchemes[i]);
+
     savable_schemes->push_back(extensions::kExtensionScheme);
-    standard_schemes->push_back(extensions::kExtensionResourceScheme);
     savable_schemes->push_back(extensions::kExtensionResourceScheme);
   }