Fix how Save-Page-As responds to web requests blocked by extensions.

content/browser/download/save_file_manager.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 "build/build_config.h"
 
 #include "content/browser/download/save_file_manager.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ skipping 56 matching lines @@
                               const Referrer& referrer,
                               int render_process_host_id,
                               int render_view_routing_id,
                               int render_frame_routing_id,
                               SaveFileCreateInfo::SaveFileSource save_source,
                               const base::FilePath& file_full_path,
                               ResourceContext* context,
                               SavePackage* save_package) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
+  // Insert started saving job to tracking list.
+  DCHECK(packages_.find(save_item_id) == packages_.end());
+  packages_[save_item_id] = save_package;
+
   // Register a saving job.
   if (save_source == SaveFileCreateInfo::SAVE_FILE_FROM_NET) {
     DCHECK(url.is_valid());
 
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SaveFileManager::OnSaveURL, this, url, referrer,
                    save_item_id, save_package->id(), render_process_host_id,
                    render_view_routing_id, render_frame_routing_id, context));
   } else {
@@ skipping 107 matching lines @@
 // The IO thread will call this when saving is completed or it got error when
 // fetching data. We forward the message to OnSaveFinished in UI thread.
 void SaveFileManager::SaveFinished(SaveItemId save_item_id,
                                    SavePackageId save_package_id,
                                    bool is_success) {
   DVLOG(20) << " " << __FUNCTION__ << "()"
             << " save_item_id = " << save_item_id
             << " save_package_id = " << save_package_id
             << " is_success = " << is_success;
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+
+  int64_t bytes_so_far;
   SaveFile* save_file = LookupSaveFile(save_item_id);
   if (save_file != nullptr) {
     DCHECK(save_file->InProgress());
     DVLOG(20) << " " << __FUNCTION__ << "()"
               << " save_file = " << save_file->DebugString();
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&SaveFileManager::OnSaveFinished, this, save_item_id,
-                   save_file->BytesSoFar(), is_success));
-
+    bytes_so_far = save_file->BytesSoFar();
     save_file->Finish();
     save_file->Detach();
+  } else {
+    // We got called before StartSave - this should only happen if
+    // ResourceHandler failed before it got a chance to parse headers
+    // and metadata.
+    DCHECK(!is_success);
+
+    bytes_so_far = 0;
   }
+
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&SaveFileManager::OnSaveFinished, this, save_item_id,
+                 bytes_so_far, is_success));
 }
 
 // Notifications sent from the file thread and run on the UI thread.
 
 void SaveFileManager::OnStartSave(const SaveFileCreateInfo& info) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   SavePackage* save_package = GetSavePackageFromRenderIds(
       info.render_process_id, info.render_frame_routing_id);
   if (!save_package) {
     // Cancel this request.
     SendCancelRequest(info.save_item_id);
     return;
   }
 
-  // Insert started saving job to tracking list.
-  DCHECK(packages_.find(info.save_item_id) == packages_.end());
-  packages_[info.save_item_id] = save_package;
-
   // Forward this message to SavePackage.
   save_package->StartSave(&info);
 }
 
 void SaveFileManager::OnUpdateSaveProgress(SaveItemId save_item_id,
                                            int64_t bytes_so_far,
                                            bool write_success) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   SavePackage* package = LookupPackage(save_item_id);
   if (package)
@@ skipping 166 matching lines @@
       SaveFile* save_file = it->second;
       DCHECK(!save_file->InProgress());
       base::DeleteFile(save_file->FullPath(), false);
       delete save_file;
       save_file_map_.erase(it);
     }
   }
 }
 
 }  // namespace content