| Index: content/browser/renderer_host/sync_resource_handler.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/sync_resource_handler.cc (revision 111374)
|
| +++ content/browser/renderer_host/sync_resource_handler.cc (working copy)
|
| @@ -35,10 +35,11 @@
|
| return true;
|
| }
|
|
|
| -bool SyncResourceHandler::OnRequestRedirected(int request_id,
|
| - const GURL& new_url,
|
| - ResourceResponse* response,
|
| - bool* defer) {
|
| +bool SyncResourceHandler::OnRequestRedirected(
|
| + int request_id,
|
| + const GURL& new_url,
|
| + content::ResourceResponse* response,
|
| + bool* defer) {
|
| net::URLRequest* request = rdh_->GetURLRequest(
|
| GlobalRequestID(filter_->child_id(), request_id));
|
| if (rdh_->delegate())
|
| @@ -56,8 +57,9 @@
|
| return true;
|
| }
|
|
|
| -bool SyncResourceHandler::OnResponseStarted(int request_id,
|
| - ResourceResponse* response) {
|
| +bool SyncResourceHandler::OnResponseStarted(
|
| + int request_id,
|
| + content::ResourceResponse* response) {
|
| net::URLRequest* request = rdh_->GetURLRequest(
|
| GlobalRequestID(filter_->child_id(), request_id));
|
| if (rdh_->delegate())
|
| @@ -66,16 +68,16 @@
|
| DevToolsNetLogObserver::PopulateResponseInfo(request, response);
|
|
|
| // We don't care about copying the status here.
|
| - result_.headers = response->response_head.headers;
|
| - result_.mime_type = response->response_head.mime_type;
|
| - result_.charset = response->response_head.charset;
|
| - result_.download_file_path = response->response_head.download_file_path;
|
| - result_.request_time = response->response_head.request_time;
|
| - result_.response_time = response->response_head.response_time;
|
| - result_.connection_id = response->response_head.connection_id;
|
| - result_.connection_reused = response->response_head.connection_reused;
|
| - result_.load_timing = response->response_head.load_timing;
|
| - result_.devtools_info = response->response_head.devtools_info;
|
| + result_.headers = response->headers;
|
| + result_.mime_type = response->mime_type;
|
| + result_.charset = response->charset;
|
| + result_.download_file_path = response->download_file_path;
|
| + result_.request_time = response->request_time;
|
| + result_.response_time = response->response_time;
|
| + result_.connection_id = response->connection_id;
|
| + result_.connection_reused = response->connection_reused;
|
| + result_.load_timing = response->load_timing;
|
| + result_.devtools_info = response->devtools_info;
|
| return true;
|
| }
|
|
|
|
|