Fix remove internal codename from chrome_cleaner/settings

R=proberge

Bug: 830892
Change-Id: I2dca13dc4046021fa7091ae737b4dba093c6e87f
Reviewed-on: https://chromium-review.googlesource.com/1165844
Commit-Queue: Joe Mason <joenotcharles@chromium.org>
Reviewed-by: proberge <proberge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581316}

chrome/chrome_cleaner/constants/chrome_cleaner_switches.cc

@@ -29,7 +29,8 @@ const char kCrashSwitch[] = "crash";
 
 // Dump the raw logs to a file with the same base name as the executable. The
 // dumped file is a raw protobuf and has a "pb" extension.
-// WARNING: this switch is used internally. Be careful when making changes.
+// WARNING: this switch is used by internal test systems. Be careful when making
+// changes.
 const char kDumpRawLogsSwitch[] = "dump-raw-logs";
 
 // Identify that the process is already supposed to be elevated, so that we
@@ -48,7 +49,8 @@ const char kForceSelfDeleteSwitch[] = "force-self-delete";
 
 // Log all removable UwS that were not detected, but the scanner found some
 // UwS-related footprints.
-// WARNING: this switch is used internally. Be careful when making changes.
+// WARNING: this switch is used by internal test systems. Be careful when making
+// changes.
 const char kForceUwsDetectionSwitch[] = "force-uws-detection";
 
 // The handle of an event to signal when the initialization of the main process
@@ -82,7 +84,8 @@ const char kNoCrashUploadSwitch[] = "no-crash-upload";
 const char kNoRecoveryComponentSwitch[] = "no-recovery-component";
 
 // Prevent the logging service from uploading logs and reports.
-// WARNING: this switch is used internally, be careful when making changes.
+// WARNING: this switch is used by internal test systems, be careful when making
+// changes.
 const char kNoReportUploadSwitch[] = "no-report-upload";
 
 // Prevent the executable from deleting itself after running.
@@ -131,7 +134,8 @@ const char kTestLoggingURLSwitch[] = "test-logging-url";
 
 // Flag set during testing and stored as a crash key, to differentiate from
 // crashes received from actual users.
-// WARNING: this switch is used internally, be careful when making changes.
+// WARNING: this switch is used by internal test systems, be careful when making
+// changes.
 const char kTestingSwitch[] = "testing";
 
 // Specifies the full path to a protocol buffer log file to be uploaded.

chrome/chrome_cleaner/settings/settings.cc

@@ -43,7 +43,8 @@ Engine::Name GetEngine(const base::CommandLine& command_line) {
 
 ExecutionMode GetExecutionMode(const base::CommandLine& command_line) {
   int val = -1;
-  // WARNING: this switch is used in Bineval, be careful when making changes.
+  // WARNING: this switch is used by internal test systems, be careful when
+  // making changes.
   if (base::StringToInt(command_line.GetSwitchValueASCII(kExecutionModeSwitch),
                         &val) &&
       val > static_cast<int>(ExecutionMode::kNone) &&
@@ -60,8 +61,8 @@ bool GetLogsCollectionEnabled(const base::CommandLine& command_line,
     case TargetBinary::kReporter:
       // For the reporter, if logging collection is enabled, then we will save
       // UwS matching to a proto that can be saved to disk or sent to Google if
-      // logs upload is allowed. WARNING: this switch is used in Bineval, be
-      // careful when making changes.
+      // logs upload is allowed. WARNING: this switch is used by internal test
+      // systems, be careful when making changes.
       return command_line.HasSwitch(kExtendedSafeBrowsingEnabledSwitch);
     case TargetBinary::kCleaner:
       // Logs collection is only enabled if the user did not opt out, which
@@ -79,7 +80,8 @@ bool GetLogsCollectionEnabled(const base::CommandLine& command_line,
 bool GetLogsUploadAllowed(const base::CommandLine& command_line,
                           TargetBinary target_binary,
                           ExecutionMode execution_mode) {
-  // WARNING: this switch is used in Bineval, be careful when making changes.
+  // WARNING: this switch is used by internal test systems, be careful when
+  // making changes.
   if (command_line.HasSwitch(kNoReportUploadSwitch))
     return false;
 
@@ -90,7 +92,8 @@ bool GetAllowCrashReportUpload(const base::CommandLine& command_line) {
   if (command_line.HasSwitch(kNoCrashUploadSwitch))
     return false;
 
-  // WARNING: this switch is used in Bineval, be careful when making changes.
+  // WARNING: this switch is used by internal test systems, be careful when
+  // making changes.
   return command_line.HasSwitch(kEnableCrashReportingSwitch);
 }
 
@@ -308,7 +311,8 @@ void Settings::Initialize(const base::CommandLine& command_line,
   engine_ = GetEngine(command_line);
 
   metrics_enabled_ = command_line.HasSwitch(kUmaUserSwitch);
-  // WARNING: this switch is used in Bineval, be careful when making changes.
+  // WARNING: this switch is used by internal test systems, be careful when
+  // making changes.
   sber_enabled_ = command_line.HasSwitch(kExtendedSafeBrowsingEnabledSwitch);
   execution_mode_ = GetExecutionMode(command_line);
   logs_upload_allowed_ =