Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: content/browser/webui/web_ui_url_loader_factory.cc

Issue 2875143002: Reduce boilerplate when creating simple mojom::URLLoaders. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/webui/web_ui_url_loader_factory.cc
diff --git a/content/browser/webui/web_ui_url_loader_factory.cc b/content/browser/webui/web_ui_url_loader_factory.cc
index a349bd942423407f454545a8d4aabe483a8c0517..1e5bad3a48ebbaf8b031fb7fe831f0f68906f743 100644
--- a/content/browser/webui/web_ui_url_loader_factory.cc
+++ b/content/browser/webui/web_ui_url_loader_factory.cc
@@ -90,15 +90,7 @@ void ReadData(scoped_refptr<ResourceResponse> headers,
uint32_t output_size =
gzipped ? compression::GetUncompressedSize(input) : bytes->size();
- MojoCreateDataPipeOptions options;
- options.struct_size = sizeof(MojoCreateDataPipeOptions);
- options.flags = MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE;
- options.element_num_bytes = 1;
- options.capacity_num_bytes = output_size;
- mojo::DataPipe data_pipe(options);
-
- DCHECK(data_pipe.producer_handle.is_valid());
- DCHECK(data_pipe.consumer_handle.is_valid());
+ mojo::DataPipe data_pipe(output_size);
void* buffer = nullptr;
uint32_t num_bytes = output_size;
@@ -118,14 +110,7 @@ void ReadData(scoped_refptr<ResourceResponse> headers,
CHECK_EQ(result, MOJO_RESULT_OK);
client->OnStartLoadingResponseBody(std::move(data_pipe.consumer_handle));
-
- ResourceRequestCompletionStatus request_complete_data;
- request_complete_data.error_code = net::OK;
- request_complete_data.exists_in_cache = false;
- request_complete_data.completion_time = base::TimeTicks::Now();
- request_complete_data.encoded_data_length = output_size;
- request_complete_data.encoded_body_length = output_size;
- client->OnComplete(request_complete_data);
+ client->OnComplete(ResourceRequestCompletionStatus(output_size));
}
void DataAvailable(scoped_refptr<ResourceResponse> headers,
« no previous file with comments | « content/browser/histogram_internals_url_loader.cc ('k') | content/common/resource_request_completion_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698