summaryrefslogtreecommitdiffstats
path: root/components/test
diff options
context:
space:
mode:
authortyoshino <tyoshino@chromium.org>2015-08-18 05:50:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-18 12:51:15 +0000
commit1ac9ec7bccd1b5178b18338b10149f36292f5fb6 (patch)
treea257a5763665b93a2edd8bb9fbcbf26e3dd7046a /components/test
parent897bb847ac903313cdcabd976155e2d15ef8ad79 (diff)
downloadchromium_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 'components/test')
-rw-r--r--components/test/run_all_unittests.cc8
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(