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

Side by Side Diff: content/browser/service_worker/service_worker_fetch_dispatcher.cc

Issue 2817033002: Plumb the net::SSLInfo to the browser process when it's using the network service. (Closed)
Patch Set: add net::SSLInfo test Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" 5 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 client_->OnUploadProgress(current_position, total_size, ack_callback); 154 client_->OnUploadProgress(current_position, total_size, ack_callback);
155 } 155 }
156 void OnReceiveCachedMetadata(const std::vector<uint8_t>& data) override { 156 void OnReceiveCachedMetadata(const std::vector<uint8_t>& data) override {
157 client_->OnReceiveCachedMetadata(data); 157 client_->OnReceiveCachedMetadata(data);
158 } 158 }
159 void OnTransferSizeUpdated(int32_t transfer_size_diff) override { 159 void OnTransferSizeUpdated(int32_t transfer_size_diff) override {
160 client_->OnTransferSizeUpdated(transfer_size_diff); 160 client_->OnTransferSizeUpdated(transfer_size_diff);
161 } 161 }
162 void OnReceiveResponse( 162 void OnReceiveResponse(
163 const ResourceResponseHead& head, 163 const ResourceResponseHead& head,
164 const base::Optional<net::SSLInfo>& ssl_info,
164 mojom::DownloadedTempFilePtr downloaded_file) override { 165 mojom::DownloadedTempFilePtr downloaded_file) override {
165 client_->OnReceiveResponse(head, std::move(downloaded_file)); 166 client_->OnReceiveResponse(head, ssl_info, std::move(downloaded_file));
166 DCHECK(on_response_); 167 DCHECK(on_response_);
167 std::move(on_response_).Run(); 168 std::move(on_response_).Run();
168 AddDevToolsCallback( 169 AddDevToolsCallback(
169 base::Bind(&NotifyNavigationPreloadResponseReceivedOnUI, url_, head)); 170 base::Bind(&NotifyNavigationPreloadResponseReceivedOnUI, url_, head));
170 } 171 }
171 void OnReceiveRedirect(const net::RedirectInfo& redirect_info, 172 void OnReceiveRedirect(const net::RedirectInfo& redirect_info,
172 const ResourceResponseHead& head) override { 173 const ResourceResponseHead& head) override {
173 completed_ = true; 174 completed_ = true;
174 // When the server returns a redirect response, we only send 175 // When the server returns a redirect response, we only send
175 // OnReceiveRedirect IPC and don't send OnComplete IPC. The service worker 176 // OnReceiveRedirect IPC and don't send OnComplete IPC. The service worker
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 preload_handle_->url_loader_client_request = 591 preload_handle_->url_loader_client_request =
591 mojo::MakeRequest(&url_loader_client_ptr); 592 mojo::MakeRequest(&url_loader_client_ptr);
592 auto url_loader_client = base::MakeUnique<DelegatingURLLoaderClient>( 593 auto url_loader_client = base::MakeUnique<DelegatingURLLoaderClient>(
593 std::move(url_loader_client_ptr), std::move(on_response), request); 594 std::move(url_loader_client_ptr), std::move(on_response), request);
594 mojom::URLLoaderClientPtr url_loader_client_ptr_to_pass; 595 mojom::URLLoaderClientPtr url_loader_client_ptr_to_pass;
595 url_loader_client->Bind(&url_loader_client_ptr_to_pass); 596 url_loader_client->Bind(&url_loader_client_ptr_to_pass);
596 mojom::URLLoaderAssociatedPtr url_loader_associated_ptr; 597 mojom::URLLoaderAssociatedPtr url_loader_associated_ptr;
597 598
598 url_loader_factory->CreateLoaderAndStart( 599 url_loader_factory->CreateLoaderAndStart(
599 mojo::MakeRequest(&url_loader_associated_ptr), 600 mojo::MakeRequest(&url_loader_associated_ptr),
600 original_info->GetRouteID(), request_id, request, 601 original_info->GetRouteID(), request_id, mojom::kURLLoadOptionNone,
601 std::move(url_loader_client_ptr_to_pass)); 602 request, std::move(url_loader_client_ptr_to_pass));
602 603
603 std::unique_ptr<DelegatingURLLoader> url_loader( 604 std::unique_ptr<DelegatingURLLoader> url_loader(
604 base::MakeUnique<DelegatingURLLoader>( 605 base::MakeUnique<DelegatingURLLoader>(
605 std::move(url_loader_associated_ptr))); 606 std::move(url_loader_associated_ptr)));
606 preload_handle_->url_loader = url_loader->CreateInterfacePtrAndBind(); 607 preload_handle_->url_loader = url_loader->CreateInterfacePtrAndBind();
607 url_loader_assets_ = 608 url_loader_assets_ =
608 new URLLoaderAssets(std::move(url_loader_factory), std::move(url_loader), 609 new URLLoaderAssets(std::move(url_loader_factory), std::move(url_loader),
609 std::move(url_loader_client)); 610 std::move(url_loader_client));
610 return true; 611 return true;
611 } 612 }
(...skipping 10 matching lines...) Expand all
622 ServiceWorkerVersion* version, 623 ServiceWorkerVersion* version,
623 int event_finish_id, 624 int event_finish_id,
624 scoped_refptr<URLLoaderAssets> url_loader_assets, 625 scoped_refptr<URLLoaderAssets> url_loader_assets,
625 ServiceWorkerStatusCode status, 626 ServiceWorkerStatusCode status,
626 base::Time dispatch_event_time) { 627 base::Time dispatch_event_time) {
627 version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT, 628 version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT,
628 dispatch_event_time); 629 dispatch_event_time);
629 } 630 }
630 631
631 } // namespace content 632 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/url_loader_factory_impl_unittest.cc ('k') | content/child/resource_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698