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

Unified Diff: content/browser/renderer_host/resource_loader.cc

Issue 10416003: RefCounted types should not have public destructors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One more fix Created 8 years, 6 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/renderer_host/resource_loader.cc
diff --git a/content/browser/renderer_host/resource_loader.cc b/content/browser/renderer_host/resource_loader.cc
index a1baea5531a6f26e79f76ffa585f21150f46345e..be923ca81f9f7dae88c38ee5ac58a5a459ee38e7 100644
--- a/content/browser/renderer_host/resource_loader.cc
+++ b/content/browser/renderer_host/resource_loader.cc
@@ -28,23 +28,24 @@ namespace {
void PopulateResourceResponse(net::URLRequest* request,
ResourceResponse* response) {
- response->status = request->status();
- response->request_time = request->request_time();
- response->response_time = request->response_time();
- response->headers = request->response_headers();
- request->GetCharset(&response->charset);
- response->content_length = request->GetExpectedContentSize();
- request->GetMimeType(&response->mime_type);
+ response->head.status = request->status();
+ response->head.request_time = request->request_time();
+ response->head.response_time = request->response_time();
+ response->head.headers = request->response_headers();
+ request->GetCharset(&response->head.charset);
+ response->head.content_length = request->GetExpectedContentSize();
+ request->GetMimeType(&response->head.mime_type);
net::HttpResponseInfo response_info = request->response_info();
- response->was_fetched_via_spdy = response_info.was_fetched_via_spdy;
- response->was_npn_negotiated = response_info.was_npn_negotiated;
- response->npn_negotiated_protocol = response_info.npn_negotiated_protocol;
- response->was_fetched_via_proxy = request->was_fetched_via_proxy();
- response->socket_address = request->GetSocketAddress();
+ response->head.was_fetched_via_spdy = response_info.was_fetched_via_spdy;
+ response->head.was_npn_negotiated = response_info.was_npn_negotiated;
+ response->head.npn_negotiated_protocol =
+ response_info.npn_negotiated_protocol;
+ response->head.was_fetched_via_proxy = request->was_fetched_via_proxy();
+ response->head.socket_address = request->GetSocketAddress();
appcache::AppCacheInterceptor::GetExtraResponseInfo(
request,
- &response->appcache_id,
- &response->appcache_manifest_url);
+ &response->head.appcache_id,
+ &response->head.appcache_manifest_url);
}
} // namespace
@@ -491,7 +492,7 @@ bool ResourceLoader::CompleteResponseStarted() {
int cert_id =
CertStore::GetInstance()->StoreCert(request_->ssl_info().cert,
info->GetChildID());
- response->security_info = SerializeSecurityInfo(
+ response->head.security_info = SerializeSecurityInfo(
cert_id,
request_->ssl_info().cert_status,
request_->ssl_info().security_bits,

Powered by Google App Engine
This is Rietveld 408576698