Don't block shutdown in chrome/browser/win/conflicts/

This CL ensures that the ModuleDatabase task runner, the inspection
results cache task runner and the module blacklist cache task runner
don't block shutdown.

Also, this CL changes the inspection results cache so that it is updated
atomically.

Bug: 1021904, 1022041
Change-Id: Ia87e13f60e00725583f95c55e231edfd4d7648b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1899750Reviewed-by: Gabriel Charette <gab@chromium.org>
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713191}

chrome/browser/win/conflicts/inspection_results_cache.cc

@@ -10,8 +10,10 @@
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/files/important_file_writer.h"
 #include "base/hash/md5.h"
 #include "base/pickle.h"
+#include "base/strings/string_piece.h"
 
 namespace {
 
@@ -232,6 +234,10 @@ bool WriteInspectionResultsCache(
 
   base::Pickle pickle =
       SerializeInspectionResultsCache(inspection_results_cache);
-  return base::WriteFile(file_path, static_cast<const char*>(pickle.data()),
-                         pickle.size()) == static_cast<int>(pickle.size());
+
+  // TODO(1022041): Investigate if using WriteFileAtomically() in a
+  // CONTINUE_ON_SHUTDOWN sequence can cause too many corrupted caches.
+  return base::ImportantFileWriter::WriteFileAtomically(
+      file_path, base::StringPiece(static_cast<const char*>(pickle.data()),
+                                   pickle.size()));
 }

chrome/browser/win/conflicts/module_blacklist_cache_util.cc

@@ -161,6 +161,8 @@ bool WriteModuleBlacklistCache(
       sizeof(third_party_dlls::PackedListModule) * blacklisted_modules.size());
   file_contents.append(std::begin(md5_digest->a), std::end(md5_digest->a));
 
+  // TODO(1022041): Investigate if using WriteFileAtomically() in a
+  // CONTINUE_ON_SHUTDOWN sequence doesn't cause too many corrupted caches.
   return base::ImportantFileWriter::WriteFileAtomically(
       module_blacklist_cache_path, file_contents);
 }

chrome/browser/win/conflicts/module_database.cc

@@ -132,7 +132,7 @@ scoped_refptr<base::SequencedTaskRunner> ModuleDatabase::GetTaskRunner() {
   static base::LazySequencedTaskRunner g_distinct_task_runner =
       LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
           base::TaskTraits(base::ThreadPool(), base::TaskPriority::BEST_EFFORT,
-                           base::TaskShutdownBehavior::BLOCK_SHUTDOWN));
+                           base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN));
 
   return base::FeatureList::IsEnabled(kDistinctModuleDatabaseSequence)
              ? g_distinct_task_runner.Get()

chrome/browser/win/conflicts/module_inspector.cc

@@ -91,7 +91,7 @@ ModuleInspector::ModuleInspector(
       cache_task_runner_(base::CreateSequencedTaskRunner(
           {base::ThreadPool(), base::MayBlock(),
            base::TaskPriority::BEST_EFFORT,
-           base::TaskShutdownBehavior::BLOCK_SHUTDOWN})),
+           base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN})),
       inspection_results_cache_read_(false),
       flush_inspection_results_timer_(
           FROM_HERE,