Offline Pages: Remove leftover file if MHTML generation error occurred.

chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc

 // Copyright 2015 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/android/offline_pages/offline_page_mhtml_archiver.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
 #include "components/security_state/security_state_model.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/mhtml_generation_params.h"
 #include "net/base/filename_util.h"
 
 namespace offline_pages {
 namespace {
 const base::FilePath::CharType kMHTMLExtension[] = FILE_PATH_LITERAL("mhtml");
 const base::FilePath::CharType kDefaultFileName[] =
     FILE_PATH_LITERAL("offline_page");
 const int kTitleLengthMax = 80;
 const char kMHTMLFileNameExtension[] = ".mhtml";
 const char kFileNameComponentsSeparator[] = "-";
 const char kReplaceChars[] = " ";
 const char kReplaceWith[] = "_";
+
+void DeleteFileOnFileThread(const base::FilePath& file_path,
+                            const base::Closure& callback) {
+  scoped_refptr<base::SequencedWorkerPool> worker_pool(
+      content::BrowserThread::GetBlockingPool());

[Dmitry Titov, 2016/06/02 00:03:55]

Isn't it what BrowserThread::FILE is for?

[dewittj, 2016/06/02 18:05:37]

Done.

+  // Blocks shutdown because otherwise there would be leftover junk files.
+  scoped_refptr<base::SequencedTaskRunner> task_runner(
+      worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
+          worker_pool->GetSequenceToken(),
+          base::SequencedWorkerPool::BLOCK_SHUTDOWN));
+  task_runner->PostTaskAndReply(
+      FROM_HERE, base::Bind(base::IgnoreResult(&base::DeleteFile), file_path,
+                            false /* recursive */),
+      callback);
+}
 }  // namespace
 
 // static
 std::string OfflinePageMHTMLArchiver::GetFileNameExtension() {
     return kMHTMLFileNameExtension;
 }
 
 // static
 base::FilePath OfflinePageMHTMLArchiver::GenerateFileName(
     const GURL& url,
@@ skipping 86 matching lines @@
   web_contents_->GenerateMHTML(
       params, base::Bind(&OfflinePageMHTMLArchiver::OnGenerateMHTMLDone,
                          weak_ptr_factory_.GetWeakPtr(), url, file_path));
 }
 
 void OfflinePageMHTMLArchiver::OnGenerateMHTMLDone(
     const GURL& url,
     const base::FilePath& file_path,
     int64_t file_size) {
   if (file_size < 0) {
-    ReportFailure(ArchiverResult::ERROR_ARCHIVE_CREATION_FAILED);
+    DeleteFileOnFileThread(
+        file_path, base::Bind(&OfflinePageMHTMLArchiver::ReportFailure,
+                              weak_ptr_factory_.GetWeakPtr(),
+                              ArchiverResult::ERROR_ARCHIVE_CREATION_FAILED));
   } else {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(callback_, this, ArchiverResult::SUCCESSFULLY_CREATED, url,
                    file_path, file_size));
   }
 }
 
 bool OfflinePageMHTMLArchiver::HasConnectionSecurityError() {
   ChromeSecurityStateModelClient::CreateForWebContents(web_contents_);
   ChromeSecurityStateModelClient* model_client =
       ChromeSecurityStateModelClient::FromWebContents(web_contents_);
   DCHECK(model_client);
   return security_state::SecurityStateModel::SecurityLevel::SECURITY_ERROR ==
          model_client->GetSecurityInfo().security_level;
 }
 
 void OfflinePageMHTMLArchiver::ReportFailure(ArchiverResult result) {
   DCHECK(result != ArchiverResult::SUCCESSFULLY_CREATED);
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(callback_, this, result, GURL(), base::FilePath(), 0));
 }
 
 }  // namespace offline_pages