[Downloads] Rework how hashes are calculated for download files.

content/browser/download/download_request_core.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/download/download_request_core.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 60 matching lines @@
 };
 
 // static
 const int DownloadRequestData::kKey = 0;
 
 // static
 void DownloadRequestData::Attach(net::URLRequest* request,
                                  DownloadUrlParameters* parameters,
                                  uint32_t download_id) {
   DownloadRequestData* request_data = new DownloadRequestData;
-  request_data->save_info_.reset(new DownloadSaveInfo);
-  request_data->save_info_->file_path = parameters->file_path();
-  request_data->save_info_->suggested_name = parameters->suggested_name();
-  request_data->save_info_->file = parameters->GetFile();
-  request_data->save_info_->offset = parameters->offset();
-  request_data->save_info_->hash_state = parameters->hash_state();
-  request_data->save_info_->prompt_for_save_location = parameters->prompt();
+  request_data->save_info_.reset(
+      new DownloadSaveInfo(parameters->GetSaveInfo()));
   request_data->download_id_ = download_id;
   request_data->on_started_callback_ = parameters->callback();
   request->SetUserData(&kKey, request_data);
 }
 
 // static
 DownloadRequestData* DownloadRequestData::Get(net::URLRequest* request) {
   return static_cast<DownloadRequestData*>(request->GetUserData(&kKey));
 }
 
@@ skipping 499 matching lines @@
       DCHECK_NE(1, http_headers.response_code() / 100);
       return DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED;
   }
 
   if (save_info && save_info->offset > 0) {
     // The caller is expecting a partial response.
 
     if (http_headers.response_code() != net::HTTP_PARTIAL_CONTENT) {
       // Requested a partial range, but received the entire response.
       save_info->offset = 0;
-      save_info->hash_state.clear();
+      save_info->hash_of_partial_file.clear();
+      save_info->hash_state.reset();
       return DOWNLOAD_INTERRUPT_REASON_NONE;
     }
 
     int64_t first_byte = -1;
     int64_t last_byte = -1;
     int64_t length = -1;
     if (!http_headers.GetContentRange(&first_byte, &last_byte, &length))
       return DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT;
     DCHECK_GE(first_byte, 0);
 
@@ skipping 10 matching lines @@
     return DOWNLOAD_INTERRUPT_REASON_NONE;
   }
 
   if (http_headers.response_code() == net::HTTP_PARTIAL_CONTENT)
     return DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT;
 
   return DOWNLOAD_INTERRUPT_REASON_NONE;
 }
 
 }  // namespace content