diff options
| author | tyoshino <tyoshino@chromium.org> | 2015-08-19 01:51:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-19 08:52:22 +0000 |
| commit | 11a7c9fe93850341043844ab48bf379c485d05b1 (patch) | |
| tree | af53c4126a6f36fbbc4b965205a7630743f365c7 /components/test | |
| parent | 2dafe52f9b16aa9833f3a5455632c7bbb64c9080 (diff) | |
| download | chromium_src-11a7c9fe93850341043844ab48bf379c485d05b1.zip chromium_src-11a7c9fe93850341043844ab48bf379c485d05b1.tar.gz chromium_src-11a7c9fe93850341043844ab48bf379c485d05b1.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
Committed: https://crrev.com/1ac9ec7bccd1b5178b18338b10149f36292f5fb6
Cr-Commit-Position: refs/heads/master@{#343895}
Review URL: https://codereview.chromium.org/1272113002
Cr-Commit-Position: refs/heads/master@{#344181}
Diffstat (limited to 'components/test')
| -rw-r--r-- | components/test/run_all_unittests.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc index 572eb6f..9edbe9c 100644 --- a/components/test/run_all_unittests.cc +++ b/components/test/run_all_unittests.cc @@ -78,10 +78,10 @@ class ComponentsTestSuite : public base::TestSuite { // These schemes need to be added globally to pass tests of // autocomplete_input_unittest.cc and content_settings_pattern* - url::AddStandardScheme("chrome"); - url::AddStandardScheme("chrome-extension"); - url::AddStandardScheme("chrome-devtools"); - url::AddStandardScheme("chrome-search"); + 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); // Not using kExtensionScheme to avoid the dependency to extensions. ContentSettingsPattern::SetNonWildcardDomainNonPortScheme( |