Commit 85c64608 authored by Matt Menke's avatar Matt Menke Committed by Commit Bot

Make ServiceWorker tests use two arg ResponseHeader manipulation calls

We want to get rid of the single argument AddHeader() method as the two
argument AddHeader() and SetHeader() methods are safer and more flexible.

Bug: 1068194
Change-Id: Iee2e0768724c1fb666a9cb9be27c13370781b818
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148022
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Auto-Submit: Matt Menke <mmenke@chromium.org>
Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759012}
parent fc049f1b
...@@ -1884,7 +1884,7 @@ TEST_F(ServiceWorkerStorageOriginTrialsDiskTest, FromMainScript) { ...@@ -1884,7 +1884,7 @@ TEST_F(ServiceWorkerStorageOriginTrialsDiskTest, FromMainScript) {
response_head.ssl_info->connection_status = 0x300039; response_head.ssl_info->connection_status = 0x300039;
const std::string kHTTPHeaderLine("HTTP/1.1 200 OK\n\n"); const std::string kHTTPHeaderLine("HTTP/1.1 200 OK\n\n");
const std::string kOriginTrial("Origin-Trial: "); const std::string kOriginTrial("Origin-Trial");
// Token for Feature1 which expires 2033-05-18. // Token for Feature1 which expires 2033-05-18.
// generate_token.py valid.example.com Feature1 --expire-timestamp=2000000000 // generate_token.py valid.example.com Feature1 --expire-timestamp=2000000000
// TODO(horo): Generate this sample token during the build. // TODO(horo): Generate this sample token during the build.
...@@ -1913,10 +1913,10 @@ TEST_F(ServiceWorkerStorageOriginTrialsDiskTest, FromMainScript) { ...@@ -1913,10 +1913,10 @@ TEST_F(ServiceWorkerStorageOriginTrialsDiskTest, FromMainScript) {
"ol2RFf+4Sdm1hQ4AAABYeyJvcmlnaW4iOiAiaHR0cHM6Ly92YWxpZC5leGFtcGxlLmNvbTo0" "ol2RFf+4Sdm1hQ4AAABYeyJvcmlnaW4iOiAiaHR0cHM6Ly92YWxpZC5leGFtcGxlLmNvbTo0"
"NDMiLCAiZmVhdHVyZSI6ICJGZWF0dXJlMyIsICJleHBpcnkiOiAxMDAwMDAwMDAwfQ=="); "NDMiLCAiZmVhdHVyZSI6ICJGZWF0dXJlMyIsICJleHBpcnkiOiAxMDAwMDAwMDAwfQ==");
response_head.headers = base::MakeRefCounted<net::HttpResponseHeaders>(""); response_head.headers = base::MakeRefCounted<net::HttpResponseHeaders>("");
response_head.headers->AddHeader(kOriginTrial + kFeature1Token); response_head.headers->AddHeader(kOriginTrial, kFeature1Token);
response_head.headers->AddHeader(kOriginTrial + kFeature2Token1); response_head.headers->AddHeader(kOriginTrial, kFeature2Token1);
response_head.headers->AddHeader(kOriginTrial + kFeature2Token2); response_head.headers->AddHeader(kOriginTrial, kFeature2Token2);
response_head.headers->AddHeader(kOriginTrial + kFeature3ExpiredToken); response_head.headers->AddHeader(kOriginTrial, kFeature3ExpiredToken);
version->SetMainScriptResponse( version->SetMainScriptResponse(
std::make_unique<ServiceWorkerVersion::MainScriptResponse>( std::make_unique<ServiceWorkerVersion::MainScriptResponse>(
response_head)); response_head));
......
...@@ -211,7 +211,7 @@ void WriteToDiskCacheAsyncInternal( ...@@ -211,7 +211,7 @@ void WriteToDiskCacheAsyncInternal(
http_info->headers = http_info->headers =
base::MakeRefCounted<net::HttpResponseHeaders>("HTTP/1.0 200 OK\0\0"); base::MakeRefCounted<net::HttpResponseHeaders>("HTTP/1.0 200 OK\0\0");
for (const auto& header : headers) for (const auto& header : headers)
http_info->headers->AddHeader(header.first + ": " + header.second); http_info->headers->AddHeader(header.first, header.second);
scoped_refptr<HttpResponseInfoIOBuffer> info_buffer = scoped_refptr<HttpResponseInfoIOBuffer> info_buffer =
base::MakeRefCounted<HttpResponseInfoIOBuffer>(std::move(http_info)); base::MakeRefCounted<HttpResponseInfoIOBuffer>(std::move(http_info));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment