diff options
| author | msramek <msramek@chromium.org> | 2015-08-18 06:04:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-18 13:05:06 +0000 |
| commit | 9b7972dd82ae09d1d1c38c6078bc384759eb18ee (patch) | |
| tree | 2aaaec212da3f07d6e37340e03f384d66b172530 /google_apis | |
| parent | ed9b2a0e8440ce2ff16b4ed043bad27a995a39c6 (diff) | |
| download | chromium_src-9b7972dd82ae09d1d1c38c6078bc384759eb18ee.zip chromium_src-9b7972dd82ae09d1d1c38c6078bc384759eb18ee.tar.gz chromium_src-9b7972dd82ae09d1d1c38c6078bc384759eb18ee.tar.bz2 | |
Revert of Allow url::SchemeHostPort to hold non-file scheme without port (patchset #16 id:320001 of https://codereview.chromium.org/1272113002/ )
Reason for revert:
Broken build.
http://build.chromium.org/p/chromium.mac/builders/iOS_Device_%28ninja%29/builds/17899/steps/compile/logs/stdio
Original issue's description:
> 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}
TBR=rsleevi@chromium.org,mkwst@chromium.org,brettw@chromium.org,tyoshino@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=516971
Review URL: https://codereview.chromium.org/1301563003
Cr-Commit-Position: refs/heads/master@{#343898}
Diffstat (limited to 'google_apis')
| -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 9643dea..1ccae2f 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::SCHEME_WITHOUT_PORT); + url::AddStandardScheme("chrome-extension"); EXPECT_EQ( "https://www.example.com/drive/v2/files/0ADK06pfg" "?embedOrigin=chrome-extension%3A%2F%2Ftest", |