Chrome Cleaner: add finch switch for quarantine feature

The new quarantine feature for chrome cleanup tool needs a finch switch to control it.
It adds "--quarantine" into the command line when launching the cleaner if the switch is enabled.
It will be only enabled on the cleaner. So only adds switch to the cleaner, but not to the reporter.
Default is disabled.

Bug: crbug.com/878794
Change-Id: Ibb6f7bf76c36fbaf6106ede1ee9b6049cb2c5d2e
Reviewed-on: https://chromium-review.googlesource.com/1194404Reviewed-by: Chris Sharp <csharp@chromium.org>
Commit-Queue: Che-yu Wu <cheyuw@google.com>
Cr-Commit-Position: refs/heads/master@{#587710}

chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc

@@ -146,6 +146,10 @@ ChromeCleanerRunner::ChromeCleanerRunner(
   std::string reboot_prompt_type = base::IntToString(GetRebootPromptType());
   cleaner_command_line_.AppendSwitchASCII(
       chrome_cleaner::kRebootPromptMethodSwitch, reboot_prompt_type);
+
+  if (base::FeatureList::IsEnabled(kChromeCleanupQuarantineFeature)) {
+    cleaner_command_line_.AppendSwitch(chrome_cleaner::kQuarantineSwitch);
+  }
 }
 
 ChromeCleanerRunner::ProcessStatus

chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc

@@ -15,6 +15,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/multiprocess_test.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.h"
@@ -64,12 +65,14 @@ enum class ReporterEngine {
 //       process running in scanning mode.
 // - chrome_prompt (ChromePromptValue): indicates if this is a user-initiated
 //       run or if the user was prompted.
+// - quarantine_enabled (bool): indicates if the quarantine feature is enabled.
 class ChromeCleanerRunnerSimpleTest
     : public testing::TestWithParam<
           std::tuple<ChromeCleanerRunner::ChromeMetricsStatus,
                      ReporterEngine,
                      bool,
-                     ChromePromptValue>>,
+                     ChromePromptValue,
+                     bool>>,
       public ChromeCleanerRunnerTestDelegate {
  public:
   ChromeCleanerRunnerSimpleTest()
@@ -77,7 +80,13 @@ class ChromeCleanerRunnerSimpleTest
 
   void SetUp() override {
     std::tie(metrics_status_, reporter_engine_, cleaner_logs_enabled_,
-             chrome_prompt_) = GetParam();
+             chrome_prompt_, quarantine_enabled_) = GetParam();
+
+    std::vector<base::Feature> enabled_features;
+    if (quarantine_enabled_) {
+      enabled_features.push_back(kChromeCleanupQuarantineFeature);
+    }
+    scoped_feature_list_.InitWithFeatures(enabled_features, {});
 
     SetChromeCleanerRunnerTestDelegateForTesting(this);
   }
@@ -149,6 +158,7 @@ class ChromeCleanerRunnerSimpleTest
   ReporterEngine reporter_engine_;
   bool cleaner_logs_enabled_ = false;
   ChromePromptValue chrome_prompt_ = ChromePromptValue::kUnspecified;
+  bool quarantine_enabled_ = false;
 
   // Set by LaunchTestProcess.
   base::CommandLine command_line_;
@@ -158,6 +168,9 @@ class ChromeCleanerRunnerSimpleTest
   ChromeCleanerRunner::ProcessStatus process_status_;
 
   base::RunLoop run_loop_;
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 TEST_P(ChromeCleanerRunnerSimpleTest, LaunchParams) {
@@ -200,6 +213,9 @@ TEST_P(ChromeCleanerRunnerSimpleTest, LaunchParams) {
       chrome_cleaner::kRebootPromptMethodSwitch);
   int reboot_prompt = -1;
   EXPECT_TRUE(base::StringToInt(reboot_prompt_method, &reboot_prompt));
+
+  EXPECT_EQ(quarantine_enabled_,
+            command_line_.HasSwitch(chrome_cleaner::kQuarantineSwitch));
 }
 
 INSTANTIATE_TEST_CASE_P(
@@ -212,7 +228,8 @@ INSTANTIATE_TEST_CASE_P(
                    ReporterEngine::kNewEngine),
             Bool(),
             Values(ChromePromptValue::kPrompted,
-                   ChromePromptValue::kUserInitiated)));
+                   ChromePromptValue::kUserInitiated),
+            Bool()));
 
 // Enum to be used as parameter for the ChromeCleanerRunnerTest fixture below.
 enum class UwsFoundState {

chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.cc

@@ -44,6 +44,9 @@ const base::Feature kUserInitiatedChromeCleanupsFeature{
 const base::Feature kChromeCleanupDistributionFeature{
     "ChromeCleanupDistribution", base::FEATURE_DISABLED_BY_DEFAULT};
 
+const base::Feature kChromeCleanupQuarantineFeature{
+    "ChromeCleanupQuarantine", base::FEATURE_DISABLED_BY_DEFAULT};
+
 bool IsInSRTPromptFieldTrialGroups() {
   return !base::StartsWith(base::FieldTrialList::FindFullName(kSRTPromptTrial),
                            kSRTPromptOffGroup, base::CompareCase::SENSITIVE);

chrome/browser/safe_browsing/chrome_cleaner/srt_field_trial_win.h

@@ -70,6 +70,10 @@ extern const base::Feature kRebootPromptDialogFeature;
 // versions will be downloaded. When not enabled, default versions will be used.
 extern const base::Feature kChromeCleanupDistributionFeature;
 
+// Quarantine feature. When enabled, Chrome Cleaner will backup the removed
+// files.
+extern const base::Feature kChromeCleanupQuarantineFeature;
+
 extern const char kSRTPromptTrial[];
 
 // Returns true if this Chrome is in a field trial group which shows the SRT

components/chrome_cleaner/public/constants/constants.cc

@@ -24,6 +24,7 @@ const char kSessionIdSwitch[] = "session-id";
 const char kSRTPromptFieldTrialGroupNameSwitch[] = "srt-field-trial-group-name";
 const char kRebootPromptMethodSwitch[] = "reboot-prompt-method";
 const char kUmaUserSwitch[] = "uma-user";
+const char kQuarantineSwitch[] = "quarantine";
 
 // Registry paths and subkeys.
 const wchar_t kSoftwareRemovalToolRegistryKey[] =

components/chrome_cleaner/public/constants/constants.h

@@ -73,6 +73,9 @@ extern const char kRebootPromptMethodSwitch[];
 // Indicates that metrics reporting is enabled for the current user.
 extern const char kUmaUserSwitch[];
 
+// Indicates that quarantine feature is enabled.
+extern const char kQuarantineSwitch[];
+
 // Registry paths where the reporter and the cleaner will write metrics data
 // to be reported by Chrome.