Save Page As MHTML

chrome/browser/chromeos/gdata/gdata_download_observer.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 "chrome/browser/chromeos/gdata/gdata_download_observer.h"
 
 #include "base/file_util.h"
 #include "chrome/browser/chromeos/gdata/gdata_uploader.h"
 #include "chrome/browser/chromeos/gdata/gdata_upload_file_info.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
@@ skipping 115 matching lines @@
 }
 
 // static
 bool GDataDownloadObserver::IsReadyToComplete(DownloadItem* download) {
   // |download| is ready for completion (as far as GData is concerned) if:
   // 1. It's not a GData download.
   //  - or -
   // 2. The upload has completed.
   UploadingExternalData* upload_data = GetUploadingExternalData(download);
   return !IsGDataDownload(download) ||
-      (upload_data && upload_data->is_complete());
+         (upload_data && upload_data->is_complete());
 }
 
 // static
 int64 GDataDownloadObserver::GetUploadedBytes(DownloadItem* download) {
   UploadingExternalData* upload_data = GetUploadingExternalData(download);
   if (!upload_data || !upload_data->uploader())
     return 0;
   return upload_data->uploader()->GetUploadedBytes(upload_data->upload_id());
 }
 
@@ skipping 137 matching lines @@
 
   gdata_uploader_->UpdateUpload(upload_data->upload_id(), download);
 }
 
 bool GDataDownloadObserver::ShouldUpload(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Upload if the item is in pending_downloads_,
   // is complete or large enough to stream, and,
   // is not already being uploaded.
-  return pending_downloads_.count(download->GetId()) != 0 &&
+  return (pending_downloads_.count(download->GetId()) != 0) &&
          (download->AllDataSaved() ||
           download->GetReceivedBytes() > kStreamingFileSize) &&
-         GetUploadingExternalData(download) == NULL;
+         (GetUploadingExternalData(download) == NULL);
 }
 
 scoped_ptr<UploadFileInfo> GDataDownloadObserver::CreateUploadFileInfo(
     DownloadItem* download) {
   scoped_ptr<UploadFileInfo> upload_file_info(new UploadFileInfo());
 
   // GetFullPath will be a temporary location if we're streaming.
   upload_file_info->file_path = download->GetFullPath();
   upload_file_info->file_size = download->GetReceivedBytes();
 
@@ skipping 25 matching lines @@
   if (iter == pending_downloads_.end()) {
     DVLOG(1) << "Pending download not found" << download_id;
     return;
   }
   DVLOG(1) << "Completing upload for download ID " << download_id;
   DownloadItem* download = iter->second;
   UploadingExternalData* upload_data = GetUploadingExternalData(download);
   DCHECK(upload_data);
   upload_data->MarkAsComplete();
   download->MaybeCompleteDownload();
+  // MaybeCompleteDownload() only works for non-SavePackage downloads.
+  // SavePackage::Finish() is the SavePackage equivalent of
+  // MaybeCompleteDownload(). MHTML SavePackages may upload to GData (see
+  // SavePackageFilePickerChromeOS), so MHTML SavePackages use
+  // OnDownloadUpdated() to wait for the upload to complete before calling
+  // Finish(). Call UpdateObservers() manually now in case this download is an
+  // MHTML SavePackage.
+  download->UpdateObservers();
 }
 
 }  // namespace gdata