summaryrefslogtreecommitdiffstats
path: root/google_apis
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 /google_apis
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 'google_apis')
-rw-r--r--google_apis/drive/drive_api_url_generator_unittest.cc2
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",