Revert of Allow url::SchemeHostPort to hold non-file scheme without port (patchset #16 id:320001 of https://codereview.chromium.org/1272113002/ )

Reason for revert:
Broken build.

http://build.chromium.org/p/chromium.mac/builders/iOS_Device_%28ninja%29/builds/17899/steps/compile/logs/stdio

Original issue's description:
> Allow url::SchemeHostPort to hold non-file scheme without port
>
> WebSockets use url::Origin to pass origin info between renderer and
> browser. Currently, it cannot hold an origin with non-file scheme and
> no port. Chrome extensions have been using such origins, so we need
> to keep the channel to convey origin info work for such origins.
>
> BUG=516971
> R=sleevi,brettw
>
> Committed: https://crrev.com/1ac9ec7bccd1b5178b18338b10149f36292f5fb6
> Cr-Commit-Position: refs/heads/master@{#343895}

TBR=rsleevi@chromium.org,mkwst@chromium.org,brettw@chromium.org,tyoshino@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=516971

Review URL: https://codereview.chromium.org/1301563003

Cr-Commit-Position: refs/heads/master@{#343898}

3 files changed, 7 insertions, 25 deletions

diff --git a/extensions/shell/common/shell_content_client.cc b/extensions/shell/common/shell_content_client.cc
index 946fe83..1879a8f 100644
--- a/extensions/shell/common/shell_content_client.cc
+++ b/extensions/shell/common/shell_content_client.cc
@@ -74,20 +74,12 @@ void ShellContentClient::AddPepperPlugins(
 #endif  // !defined(DISABLE_NACL)
 }
 
-static const int kNumShellStandardURLSchemes = 2;
-static const url::SchemeWithType kShellStandardURLSchemes[
-    kNumShellStandardURLSchemes] = {
-  {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT},
-  {extensions::kExtensionResourceScheme, url::SCHEME_WITHOUT_PORT},
-};
-
 void ShellContentClient::AddAdditionalSchemes(
-    std::vector<url::SchemeWithType>* standard_schemes,
+    std::vector<std::string>* standard_schemes,
     std::vector<std::string>* savable_schemes) {
-  for (int i = 0; i < kNumShellStandardURLSchemes; i++)
-    standard_schemes->push_back(kShellStandardURLSchemes[i]);
-
+  standard_schemes->push_back(kExtensionScheme);
   savable_schemes->push_back(kExtensionScheme);
+  standard_schemes->push_back(kExtensionResourceScheme);
   savable_schemes->push_back(kExtensionResourceScheme);
 }
 
diff --git a/extensions/shell/common/shell_content_client.h b/extensions/shell/common/shell_content_client.h
index f105511..4e0e384 100644
--- a/extensions/shell/common/shell_content_client.h
+++ b/extensions/shell/common/shell_content_client.h
@@ -8,7 +8,6 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "content/public/common/content_client.h"
-#include "url/url_util.h"
 
 namespace extensions {
 
@@ -19,7 +18,7 @@ class ShellContentClient : public content::ContentClient {
 
   void AddPepperPlugins(
       std::vector<content::PepperPluginInfo>* plugins) override;
-  void AddAdditionalSchemes(std::vector<url::SchemeWithType>* standard_schemes,
+  void AddAdditionalSchemes(std::vector<std::string>* standard_schemes,
                             std::vector<std::string>* saveable_shemes) override;
   std::string GetUserAgent() const override;
   base::string16 GetLocalizedString(int message_id) const override;
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc
index f39e40d..aa0108f 100644
--- a/extensions/test/extensions_unittests_main.cc
+++ b/extensions/test/extensions_unittests_main.cc
@@ -16,17 +16,9 @@
 #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
@@ -38,12 +30,11 @@ class ExtensionsContentClient : public content::ContentClient {
 
   // 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);
   }