[Merge to 49] [Downloads] Avoid resetting SecureHash state across an interruption.

content/browser/download/base_file.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/base_file.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
@@ skipping 185 matching lines @@
   }
 
   Detach();
 }
 
 void BaseFile::Finish() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   if (calculate_hash_)
     secure_hash_->Finish(sha256_hash_, crypto::kSHA256Length);
-
   Close();
 }
 
+void BaseFile::FinishWithError() {
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  Close();
+}
+
 void BaseFile::SetClientGuid(const std::string& guid) {
   client_guid_ = guid;
 }
 
 // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations.
 #if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX)
 DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() {
   return DOWNLOAD_INTERRUPT_REASON_NONE;
 }
 #endif
@@ skipping 123 matching lines @@
     const char* operation,
     int os_error,
     DownloadInterruptReason reason) {
   bound_net_log_.AddEvent(
       net::NetLog::TYPE_DOWNLOAD_FILE_ERROR,
       base::Bind(&FileInterruptedNetLogCallback, operation, os_error, reason));
   return reason;
 }
 
 }  // namespace content