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 /google_apis/drive | |
| 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 'google_apis/drive')
| -rw-r--r-- | google_apis/drive/drive_api_url_generator_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/google_apis/drive/drive_api_url_generator_unittest.cc b/google_apis/drive/drive_api_url_generator_unittest.cc index 1ccae2f..9643dea 100644 --- a/google_apis/drive/drive_api_url_generator_unittest.cc +++ b/google_apis/drive/drive_api_url_generator_unittest.cc @@ -62,7 +62,7 @@ TEST_F(DriveApiUrlGeneratorTest, GetFilesGetUrl) { url_generator_.GetFilesGetUrl("0ADK06pfg", true, GURL()).spec()); // If |embed_origin| is not empty, it should be added as a query parameter. - url::AddStandardScheme("chrome-extension"); + url::AddStandardScheme("chrome-extension", url::SCHEME_WITHOUT_PORT); EXPECT_EQ( "https://www.example.com/drive/v2/files/0ADK06pfg" "?embedOrigin=chrome-extension%3A%2F%2Ftest", |