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

Side by Side Diff: content/browser/loader/mojo_async_resource_handler.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/loader/mojo_async_resource_handler.h" 5 #include "content/browser/loader/mojo_async_resource_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 189
190 mojom::DownloadedTempFilePtr downloaded_file_ptr; 190 mojom::DownloadedTempFilePtr downloaded_file_ptr;
191 if (!response->head.download_file_path.empty()) { 191 if (!response->head.download_file_path.empty()) {
192 downloaded_file_ptr = DownloadedTempFileImpl::Create(info->GetChildID(), 192 downloaded_file_ptr = DownloadedTempFileImpl::Create(info->GetChildID(),
193 info->GetRequestID()); 193 info->GetRequestID());
194 rdh_->RegisterDownloadedTempFile(info->GetChildID(), info->GetRequestID(), 194 rdh_->RegisterDownloadedTempFile(info->GetChildID(), info->GetRequestID(),
195 response->head.download_file_path); 195 response->head.download_file_path);
196 } 196 }
197 197
198 url_loader_client_->OnReceiveResponse(response->head, 198 url_loader_client_->OnReceiveResponse(response->head,
199 base::Optional<net::SSLInfo>(),
dcheng 2017/04/13 21:12:15 Nit: base::nullopt
jam 2017/04/13 23:04:22 Done.
199 std::move(downloaded_file_ptr)); 200 std::move(downloaded_file_ptr));
200 201
201 net::IOBufferWithSize* metadata = GetResponseMetadata(request()); 202 net::IOBufferWithSize* metadata = GetResponseMetadata(request());
202 if (metadata) { 203 if (metadata) {
203 const uint8_t* data = reinterpret_cast<const uint8_t*>(metadata->data()); 204 const uint8_t* data = reinterpret_cast<const uint8_t*>(metadata->data());
204 205
205 url_loader_client_->OnReceiveCachedMetadata( 206 url_loader_client_->OnReceiveCachedMetadata(
206 std::vector<uint8_t>(data, data + metadata->size())); 207 std::vector<uint8_t>(data, data + metadata->size()));
207 } 208 }
208 209
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 base::Bind(&MojoAsyncResourceHandler::OnUploadProgressACK, 595 base::Bind(&MojoAsyncResourceHandler::OnUploadProgressACK,
595 weak_factory_.GetWeakPtr())); 596 weak_factory_.GetWeakPtr()));
596 } 597 }
597 598
598 void MojoAsyncResourceHandler::OnUploadProgressACK() { 599 void MojoAsyncResourceHandler::OnUploadProgressACK() {
599 if (upload_progress_tracker_) 600 if (upload_progress_tracker_)
600 upload_progress_tracker_->OnAckReceived(); 601 upload_progress_tracker_->OnAckReceived();
601 } 602 }
602 603
603 } // namespace content 604 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698