| Index: content/browser/renderer_host/resource_dispatcher_host_impl.cc | 
| diff --git a/content/browser/renderer_host/resource_dispatcher_host_impl.cc b/content/browser/renderer_host/resource_dispatcher_host_impl.cc | 
| index 0036ada40e8cc8db9ce1fc4bbef2e51463abfbbb..025db366894c0f7a5d2d961825526447aabf44b8 100644 | 
| --- a/content/browser/renderer_host/resource_dispatcher_host_impl.cc | 
| +++ b/content/browser/renderer_host/resource_dispatcher_host_impl.cc | 
| @@ -195,23 +195,24 @@ bool ShouldServiceRequest(ProcessType process_type, | 
|  | 
| 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->data.status = request->status(); | 
| +  response->data.request_time = request->request_time(); | 
| +  response->data.response_time = request->response_time(); | 
| +  response->data.headers = request->response_headers(); | 
| +  request->GetCharset(&response->data.charset); | 
| +  response->data.content_length = request->GetExpectedContentSize(); | 
| +  request->GetMimeType(&response->data.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->data.was_fetched_via_spdy = response_info.was_fetched_via_spdy; | 
| +  response->data.was_npn_negotiated = response_info.was_npn_negotiated; | 
| +  response->data.npn_negotiated_protocol = | 
| +      response_info.npn_negotiated_protocol; | 
| +  response->data.was_fetched_via_proxy = request->was_fetched_via_proxy(); | 
| +  response->data.socket_address = request->GetSocketAddress(); | 
| appcache::AppCacheInterceptor::GetExtraResponseInfo( | 
| request, | 
| -      &response->appcache_id, | 
| -      &response->appcache_manifest_url); | 
| +      &response->data.appcache_id, | 
| +      &response->data.appcache_manifest_url); | 
| } | 
|  | 
| void RemoveDownloadFileFromChildSecurityPolicy(int child_id, | 
| @@ -1584,7 +1585,7 @@ bool ResourceDispatcherHostImpl::CompleteResponseStarted( | 
| int cert_id = | 
| CertStore::GetInstance()->StoreCert(request->ssl_info().cert, | 
| info->GetChildID()); | 
| -    response->security_info = SerializeSecurityInfo( | 
| +    response->data.security_info = SerializeSecurityInfo( | 
| cert_id, request->ssl_info().cert_status, | 
| request->ssl_info().security_bits, | 
| request->ssl_info().connection_status); | 
|  |