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

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 tests 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 client_->OnUploadProgress(current_position, total_size, ack_callback); 152 client_->OnUploadProgress(current_position, total_size, ack_callback);
153 } 153 }
154 void OnReceiveCachedMetadata(const std::vector<uint8_t>& data) override { 154 void OnReceiveCachedMetadata(const std::vector<uint8_t>& data) override {
155 client_->OnReceiveCachedMetadata(data); 155 client_->OnReceiveCachedMetadata(data);
156 } 156 }
157 void OnTransferSizeUpdated(int32_t transfer_size_diff) override { 157 void OnTransferSizeUpdated(int32_t transfer_size_diff) override {
158 client_->OnTransferSizeUpdated(transfer_size_diff); 158 client_->OnTransferSizeUpdated(transfer_size_diff);
159 } 159 }
160 void OnReceiveResponse( 160 void OnReceiveResponse(
161 const ResourceResponseHead& head, 161 const ResourceResponseHead& head,
162 const base::Optional<net::SSLInfo>& ssl_info,
162 mojom::DownloadedTempFilePtr downloaded_file) override { 163 mojom::DownloadedTempFilePtr downloaded_file) override {
163 client_->OnReceiveResponse(head, std::move(downloaded_file)); 164 client_->OnReceiveResponse(head, std::move(ssl_info),
yzshen1 2017/04/13 20:43:50 No need to use std::move().
jam 2017/04/13 21:07:29 Done.
165 std::move(downloaded_file));
164 DCHECK(on_response_); 166 DCHECK(on_response_);
165 std::move(on_response_).Run(); 167 std::move(on_response_).Run();
166 AddDevToolsCallback( 168 AddDevToolsCallback(
167 base::Bind(&NotifyNavigationPreloadResponseReceivedOnUI, url_, head)); 169 base::Bind(&NotifyNavigationPreloadResponseReceivedOnUI, url_, head));
168 } 170 }
169 void OnReceiveRedirect(const net::RedirectInfo& redirect_info, 171 void OnReceiveRedirect(const net::RedirectInfo& redirect_info,
170 const ResourceResponseHead& head) override { 172 const ResourceResponseHead& head) override {
171 completed_ = true; 173 completed_ = true;
172 // When the server returns a redirect response, we only send 174 // When the server returns a redirect response, we only send
173 // OnReceiveRedirect IPC and don't send OnComplete IPC. The service worker 175 // OnReceiveRedirect IPC and don't send OnComplete IPC. The service worker
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 preload_handle_->url_loader_client_request = 594 preload_handle_->url_loader_client_request =
593 mojo::MakeRequest(&url_loader_client_ptr); 595 mojo::MakeRequest(&url_loader_client_ptr);
594 auto url_loader_client = base::MakeUnique<DelegatingURLLoaderClient>( 596 auto url_loader_client = base::MakeUnique<DelegatingURLLoaderClient>(
595 std::move(url_loader_client_ptr), std::move(on_response), request); 597 std::move(url_loader_client_ptr), std::move(on_response), request);
596 mojom::URLLoaderClientPtr url_loader_client_ptr_to_pass; 598 mojom::URLLoaderClientPtr url_loader_client_ptr_to_pass;
597 url_loader_client->Bind(&url_loader_client_ptr_to_pass); 599 url_loader_client->Bind(&url_loader_client_ptr_to_pass);
598 mojom::URLLoaderAssociatedPtr url_loader_associated_ptr; 600 mojom::URLLoaderAssociatedPtr url_loader_associated_ptr;
599 601
600 url_loader_factory->CreateLoaderAndStart( 602 url_loader_factory->CreateLoaderAndStart(
601 mojo::MakeRequest(&url_loader_associated_ptr), 603 mojo::MakeRequest(&url_loader_associated_ptr),
602 original_info->GetRouteID(), request_id, request, 604 original_info->GetRouteID(), request_id, 0, request,
603 std::move(url_loader_client_ptr_to_pass)); 605 std::move(url_loader_client_ptr_to_pass));
604 606
605 std::unique_ptr<DelegatingURLLoader> url_loader( 607 std::unique_ptr<DelegatingURLLoader> url_loader(
606 base::MakeUnique<DelegatingURLLoader>( 608 base::MakeUnique<DelegatingURLLoader>(
607 std::move(url_loader_associated_ptr))); 609 std::move(url_loader_associated_ptr)));
608 preload_handle_->url_loader = url_loader->CreateInterfacePtrAndBind(); 610 preload_handle_->url_loader = url_loader->CreateInterfacePtrAndBind();
609 url_loader_assets_ = 611 url_loader_assets_ =
610 new URLLoaderAssets(std::move(url_loader_factory), std::move(url_loader), 612 new URLLoaderAssets(std::move(url_loader_factory), std::move(url_loader),
611 std::move(url_loader_client)); 613 std::move(url_loader_client));
612 return true; 614 return true;
(...skipping 11 matching lines...) Expand all
624 ServiceWorkerVersion* version, 626 ServiceWorkerVersion* version,
625 int event_finish_id, 627 int event_finish_id,
626 scoped_refptr<URLLoaderAssets> url_loader_assets, 628 scoped_refptr<URLLoaderAssets> url_loader_assets,
627 ServiceWorkerStatusCode status, 629 ServiceWorkerStatusCode status,
628 base::Time dispatch_event_time) { 630 base::Time dispatch_event_time) {
629 version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT, 631 version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT,
630 dispatch_event_time); 632 dispatch_event_time);
631 } 633 }
632 634
633 } // namespace content 635 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698