Commit 0a7676ab authored by Lucas Furukawa Gadani's avatar Lucas Furukawa Gadani Committed by Commit Bot

Convert storage to use the URLResponseHead mojom types.

Bug: 984550
Change-Id: I57890f2304f08733a9c6e7c22e40050f5b4423ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1877002Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Lucas Gadani <lfg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709163}
parent cbae7eaa
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_status.h" #include "net/url_request/url_request_status.h"
#include "services/network/public/cpp/constants.h" #include "services/network/public/cpp/constants.h"
#include "services/network/public/cpp/resource_response.h" #include "services/network/public/mojom/url_response_head.mojom.h"
#include "storage/browser/blob/blob_data_handle.h" #include "storage/browser/blob/blob_data_handle.h"
#include "storage/browser/blob/mojo_blob_reader.h" #include "storage/browser/blob/mojo_blob_reader.h"
...@@ -204,23 +204,23 @@ void BlobURLLoader::OnComplete(net::Error error_code, ...@@ -204,23 +204,23 @@ void BlobURLLoader::OnComplete(net::Error error_code,
void BlobURLLoader::HeadersCompleted(net::HttpStatusCode status_code, void BlobURLLoader::HeadersCompleted(net::HttpStatusCode status_code,
uint64_t content_size, uint64_t content_size,
net::IOBufferWithSize* metadata) { net::IOBufferWithSize* metadata) {
network::ResourceResponseHead response; auto response = network::mojom::URLResponseHead::New();
response.content_length = 0; response->content_length = 0;
if (status_code == net::HTTP_OK || status_code == net::HTTP_PARTIAL_CONTENT) if (status_code == net::HTTP_OK || status_code == net::HTTP_PARTIAL_CONTENT)
response.content_length = content_size; response->content_length = content_size;
response.headers = GenerateHeaders(status_code, blob_handle_.get(), response->headers = GenerateHeaders(status_code, blob_handle_.get(),
&byte_range_, total_size_, content_size); &byte_range_, total_size_, content_size);
std::string mime_type; std::string mime_type;
response.headers->GetMimeType(&mime_type); response->headers->GetMimeType(&mime_type);
// Match logic in StreamURLRequestJob::HeadersCompleted. // Match logic in StreamURLRequestJob::HeadersCompleted.
if (mime_type.empty()) if (mime_type.empty())
mime_type = "text/plain"; mime_type = "text/plain";
response.mime_type = mime_type; response->mime_type = mime_type;
// TODO(jam): some of this code can be shared with // TODO(jam): some of this code can be shared with
// services/network/url_loader.h // services/network/url_loader.h
client_->OnReceiveResponse(response); client_->OnReceiveResponse(std::move(response));
sent_headers_ = true; sent_headers_ = true;
if (metadata) { if (metadata) {
......
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