Backport some tests in /chrome/chrome_cleaner to SingleThreadTaskEnvironment

These tests were previously migrated from single-threaded MessageLoop to
a multi-threaded TaskEnvironment (then named ScopedTaskEnvironment) as
part of crbug.com/891670.

//base OWNERS decided in retrospect that it was better to keep a
single-threaded option for TaskEnvironment and introduced
SingleThreadTaskEnvironment. This CL retrofits that decision for
/chrome/chrome_cleaner.

This CL is a no-op if it passes CQ.

This CL was uploaded by git cl split.

R=proberge@chromium.org

Bug: 891670
Change-Id: I5dbb5c262c0cce3f6a77959048b36b7bf2b90ef4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787069
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: proberge <proberge@chromium.org>
Commit-Queue: proberge <proberge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693689}

Author: Gabriel Charette

chrome/chrome_cleaner/components/recovery_component_unittest.cc

@@ -67,8 +67,8 @@ class RecoveryComponentTest : public testing::Test {
   RecoveryComponentTest() : task_runner_(new base::TestSimpleTaskRunner) {}
 
   // Needed for the current task runner to be available.
-  base::test::TaskEnvironment task_environment_{
-      base::test::TaskEnvironment::MainThreadType::UI};
+  base::test::SingleThreadTaskEnvironment task_environment_{
+      base::test::SingleThreadTaskEnvironment::MainThreadType::UI};
 
   // The recover component under test. This declaration must be after the
   // |ui_message_loop_| because the |RecoveryComponent| constructor needs

chrome/chrome_cleaner/engines/broker/cleaner_sandbox_interface_unittest.cc

@@ -182,7 +182,7 @@ class CleanerSandboxInterfaceDeleteFileTest : public ::testing::Test {
 
   std::unique_ptr<chrome_cleaner::FileRemoverAPI> file_remover_;
   bool reboot_required_ = false;
-  base::test::TaskEnvironment task_environment_;
+  base::test::SingleThreadTaskEnvironment task_environment_;
 };
 
 TEST_F(CleanerSandboxInterfaceDeleteFileTest, DeleteFile_BasicFile) {

chrome/chrome_cleaner/engines/controllers/engine_cleaner_unittest.cc

@@ -94,7 +94,7 @@ class EngineCleanerTest : public testing::Test {
   TestPUPData test_pup_data_;
   std::unique_ptr<EngineCleaner> engine_cleaner_;
 
-  base::test::TaskEnvironment task_environment_;
+  base::test::SingleThreadTaskEnvironment task_environment_;
   ResultCode done_status_ = RESULT_CODE_INVALID;
 };
 

chrome/chrome_cleaner/engines/controllers/scanner_impl_unittest.cc

@@ -182,7 +182,7 @@ class ScannerImplTest : public ::testing::Test {
   }
 
   TestPUPData test_pup_data_;
-  base::test::TaskEnvironment task_environment_;
+  base::test::SingleThreadTaskEnvironment task_environment_;
 
   scoped_refptr<StrictMockEngineClient> mock_engine_client_{
       base::MakeRefCounted<StrictMockEngineClient>()};

chrome/chrome_cleaner/engines/controllers/uwe_scanner_wrapper_unittest.cc

@@ -210,7 +210,7 @@ class UwEScannerWrapperTest : public testing::Test {
 
   UwEMatchers matchers_;
   TestPUPData test_pup_data_;
-  base::test::TaskEnvironment task_environment_;
+  base::test::SingleThreadTaskEnvironment task_environment_;
 
   scoped_refptr<StrictMockEngineClient> mock_engine_client_{
       base::MakeRefCounted<StrictMockEngineClient>()};

chrome/chrome_cleaner/os/file_remover_unittest.cc

@@ -96,7 +96,7 @@ class FileRemoverTest : public ::testing::Test {
   }
 
   FileRemover default_file_remover_;
-  base::test::TaskEnvironment task_environment_;
+  base::test::SingleThreadTaskEnvironment task_environment_;
   bool reboot_required_ = false;
 };
 
@@ -444,7 +444,7 @@ class FileRemoverQuarantineTest : public base::MultiProcessTest,
   }
 
   bool use_reboot_removal_ = false;
-  base::test::TaskEnvironment task_environment_;
+  base::test::SingleThreadTaskEnvironment task_environment_;
   base::ScopedTempDir temp_dir_;
   std::unique_ptr<FileRemover> file_remover_;
 };

chrome/chrome_cleaner/parsers/broker/lnk_parser_sandbox_setup_unittest.cc

@@ -55,7 +55,7 @@ class LnkParserSandboxSetupTest : public base::MultiProcessTest {
   ParsedLnkFile test_parsed_shortcut_;
   mojom::LnkParsingResult test_result_code_;
 
-  base::test::TaskEnvironment task_environment_;
+  base::test::SingleThreadTaskEnvironment task_environment_;
 
   base::FilePath not_lnk_file_path_;
   base::ScopedTempDir temp_dir_;

chrome/chrome_cleaner/parsers/target/parser_impl_unittest.cc

@@ -76,7 +76,7 @@ class ParserImplTest : public testing::Test {
   base::FilePath not_lnk_file_path_;
   base::ScopedTempDir temp_dir_;
 
-  base::test::TaskEnvironment task_environment_;
+  base::test::SingleThreadTaskEnvironment task_environment_;
 
   SandboxedShortcutParser shortcut_parser_;
   ParsedLnkFile test_parsed_shortcut_;

chrome/chrome_cleaner/ui/chrome_proxy_main_dialog_unittest.cc

@@ -48,8 +48,8 @@ TEST_F(ChromeProxyMainDialogTest, Create) {
 }
 
 TEST_F(ChromeProxyMainDialogTest, NoPUPsFound) {
-  base::test::TaskEnvironment task_environment(
-      base::test::TaskEnvironment::MainThreadType::UI);
+  base::test::SingleThreadTaskEnvironment task_environment(
+      base::test::SingleThreadTaskEnvironment::MainThreadType::UI);
 
   base::RunLoop run_loop;
   EXPECT_CALL(delegate_, OnClose())
@@ -94,8 +94,8 @@ TEST_P(ConfirmCleanupChromeProxyMainDialogTest, ConfirmCleanup) {
       prompt_acceptance == PromptAcceptance::ACCEPTED_WITHOUT_LOGS;
   bool logs_allowed = prompt_acceptance == PromptAcceptance::ACCEPTED_WITH_LOGS;
 
-  base::test::TaskEnvironment task_environment(
-      base::test::TaskEnvironment::MainThreadType::UI);
+  base::test::SingleThreadTaskEnvironment task_environment(
+      base::test::SingleThreadTaskEnvironment::MainThreadType::UI);
 
   EXPECT_CALL(mock_settings_,
               set_logs_allowed_in_cleanup_mode(Eq(logs_allowed)))