Use TaskScheduler instead of blocking pool in enumerate_modules_model.cc.

chrome/browser/win/enumerate_modules_model.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/win/enumerate_modules_model.h"
 
 #include <softpub.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <tlhelp32.h>
@@ skipping 10 matching lines @@
 #include "base/debug/leak_annotations.h"
 #include "base/environment.h"
 #include "base/file_version_info.h"
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/scoped_generic.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/threading/sequenced_worker_pool.h"
+#include "base/task_scheduler/post_task.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/net/service_providers_win.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 114 matching lines @@
   if (first_space != base::string16::npos)
     module->version = module->version.substr(0, first_space);
 
   // The signer may be returned with trailing nulls.
   size_t first_null = module->cert_info.subject.find(L'\0');
   if (first_null != base::string16::npos)
     module->cert_info.subject.resize(first_null);
 }
 
 ModuleEnumerator::ModuleEnumerator(EnumerateModulesModel* observer)
-    : enumerated_modules_(nullptr),
+    : background_task_runner_(base::CreateTaskRunnerWithTraits(
+          base::TaskTraits()
+              .MayBlock()
+              .WithPriority(base::TaskPriority::BACKGROUND)
+              .WithShutdownBehavior(
+                  base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN))),
+      enumerated_modules_(nullptr),
       observer_(observer),
-      per_module_delay_(kDefaultPerModuleDelay) {
-}
+      per_module_delay_(kDefaultPerModuleDelay) {}
 
 ModuleEnumerator::~ModuleEnumerator() {
 }
 
 void ModuleEnumerator::ScanNow(ModulesVector* list) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   enumerated_modules_ = list;
 
   // This object can't be reaped until it has finished scanning, so its safe
   // to post a raw pointer to another thread. It will simply be leaked if the
   // scanning has not been finished before shutdown.
-  BrowserThread::GetBlockingPool()->PostWorkerTaskWithShutdownBehavior(
+  background_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&ModuleEnumerator::ScanImplStart,
-                 base::Unretained(this)),
-      base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
+      base::Bind(&ModuleEnumerator::ScanImplStart, base::Unretained(this)));
 }
 
 void ModuleEnumerator::SetPerModuleDelayToZero() {
   // Set the delay to zero so the modules enumerate as quickly as possible.
   per_module_delay_ = base::TimeDelta::FromSeconds(0);
 }
 
 void ModuleEnumerator::ScanImplStart() {
   base::TimeTicks start_time = base::TimeTicks::Now();
 
@@ skipping 22 matching lines @@
   checkpoint = checkpoint2;
   EnumerateWinsockModules();
   checkpoint2 = base::TimeTicks::Now();
   UMA_HISTOGRAM_TIMES("Conflicts.EnumerateWinsockModules",
                       checkpoint2 - checkpoint);
 
   enumeration_total_time_ = base::TimeTicks::Now() - start_time;
 
   // Post a delayed task to scan the first module. This forwards directly to
   // ScanImplFinish if there are no modules to scan.
-  BrowserThread::GetBlockingPool()->PostDelayedWorkerTask(
+  background_task_runner_->PostDelayedTask(
       FROM_HERE,
-      base::Bind(&ModuleEnumerator::ScanImplModule,
-                 base::Unretained(this),
-                 0),
+      base::Bind(&ModuleEnumerator::ScanImplModule, base::Unretained(this), 0),
       per_module_delay_);
 }
 
-void ModuleEnumerator::ScanImplDelay(size_t index) {
-  // Bounce this over to a CONTINUE_ON_SHUTDOWN task in the same pool. This is
-  // necessary to prevent shutdown hangs while inspecting a module.
-  BrowserThread::GetBlockingPool()->PostWorkerTaskWithShutdownBehavior(
-      FROM_HERE,
-      base::Bind(&ModuleEnumerator::ScanImplModule,
-                 base::Unretained(this),
-                 index),
-      base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
-}
-
 void ModuleEnumerator::ScanImplModule(size_t index) {
   while (index < enumerated_modules_->size()) {
     base::TimeTicks start_time = base::TimeTicks::Now();
     Module& entry = enumerated_modules_->at(index);
     PopulateModuleInformation(&entry);
     NormalizeModule(&entry);
     CollapsePath(&entry);
     base::TimeDelta elapsed = base::TimeTicks::Now() - start_time;
     enumeration_inspection_time_ += elapsed;
     enumeration_total_time_ += elapsed;
 
-    // With a non-zero delay, bounce back over to ScanImplDelay, which will
-    // bounce back to this function and inspect the next module.
+    // If |per_module_delay_| is non-zero, post a task to scan the next module
+    // when the delay expires.
     if (!per_module_delay_.is_zero()) {
-      BrowserThread::GetBlockingPool()->PostDelayedWorkerTask(
-          FROM_HERE,
-          base::Bind(&ModuleEnumerator::ScanImplDelay,
-                     base::Unretained(this),
-                     index + 1),
+      background_task_runner_->PostDelayedTask(
+          FROM_HERE, base::Bind(&ModuleEnumerator::ScanImplModule,
+                                base::Unretained(this), index + 1),
           per_module_delay_);
       return;
     }
 
     // If the delay has been set to zero then simply finish the rest of the
     // enumeration in this already started task.
     ++index;
   }
 
   // Getting here means that all of the modules have been inspected.
@@ skipping 330 matching lines @@
                    base::Unretained(this),
                    true));
     done = true;
   }
 }
 
 void EnumerateModulesModel::ScanNow(bool background_mode) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // |module_enumerator_| is used as a lock to know whether or not there are
-  // active/pending blocking pool tasks. If a module enumerator exists then a
-  // scan is already underway. Otherwise, either no scan has been completed or
-  // a scan has terminated.
+  // active/pending background tasks. If a module enumerator exists then a scan
+  // is already underway. Otherwise, either no scan has been completed or a scan
+  // has terminated.
   if (module_enumerator_) {
     // If a scan is in progress and this request is for immediate results, then
     // inform the background scan. This is done without any locks because the
     // other thread only reads from the value that is being modified, and on
     // Windows its an atomic write.
     if (!background_mode)
       module_enumerator_->SetPerModuleDelayToZero();
     return;
   }
 
   // Only allow a single scan per process lifetime. Immediately notify any
   // observers that the scan is complete. At this point |enumerated_modules_| is
-  // safe to access as no potentially racing blocking pool task can exist.
+  // safe to access as no potentially racing background task can exist.
   if (!enumerated_modules_.empty()) {
     for (Observer& observer : observers_)
       observer.OnScanCompleted();
     return;
   }
 
   // ScanNow does not block, rather it simply schedules a task.
   module_enumerator_.reset(new ModuleEnumerator(this));
   if (!background_mode)
     module_enumerator_->SetPerModuleDelayToZero();
@@ skipping 129 matching lines @@
 
   UMA_HISTOGRAM_COUNTS_100("Conflicts.SuspectedBadModules",
                            suspected_bad_modules_detected_);
   UMA_HISTOGRAM_COUNTS_100("Conflicts.ConfirmedBadModules",
                            confirmed_bad_modules_detected_);
 
   // Forward the callback to any registered observers.
   for (Observer& observer : observers_)
     observer.OnScanCompleted();
 }