diff options
| author | tyoshino <tyoshino@chromium.org> | 2015-08-18 05:50:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-18 12:51:15 +0000 |
| commit | 1ac9ec7bccd1b5178b18338b10149f36292f5fb6 (patch) | |
| tree | a257a5763665b93a2edd8bb9fbcbf26e3dd7046a /extensions/test | |
| parent | 897bb847ac903313cdcabd976155e2d15ef8ad79 (diff) | |
| download | chromium_src-1ac9ec7bccd1b5178b18338b10149f36292f5fb6.zip chromium_src-1ac9ec7bccd1b5178b18338b10149f36292f5fb6.tar.gz chromium_src-1ac9ec7bccd1b5178b18338b10149f36292f5fb6.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1272113002
Cr-Commit-Position: refs/heads/master@{#343895}
Diffstat (limited to 'extensions/test')
| -rw-r--r-- | extensions/test/extensions_unittests_main.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc index aa0108f..f39e40d 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); } |