Revert "Remove dead switches from Chrome switches"

This reverts commit 999679f4.

Reason for revert: switches::kSimulateElevatedRecovery is required by chrome/browser/component_updater/recovery_component_installer.cc.

Original change's description:
> Remove dead switches from Chrome switches
> 
> Over the years, the features controlled by some switches were removed
> but the switches were left behind. Remove the unused switches.
> 
> Bug: 1130298
> Change-Id: I95a9ab169dec8bc26253171d0633d9b5c611b675
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2420709
> Reviewed-by: François Doray <fdoray@chromium.org>
> Reviewed-by: Lei Zhang <thestig@chromium.org>
> Reviewed-by: Eric Lawrence [MSFT] <ericlaw@microsoft.com>
> Commit-Queue: Eric Lawrence [MSFT] <ericlaw@microsoft.com>
> Cr-Commit-Position: refs/heads/master@{#809048}

TBR=thestig@chromium.org,fdoray@chromium.org,ericlaw@microsoft.com

Change-Id: Ief5553bee0feb2b813f37cb2639e8c6518f50ea9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1130298
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422483Reviewed-by: Eric Lawrence [MSFT] <ericlaw@microsoft.com>
Commit-Queue: Eric Lawrence [MSFT] <ericlaw@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#809078}

chrome/common/chrome_switches.cc

@@ -229,6 +229,10 @@ const char kDisablePrintPreview[]           = "disable-print-preview";
 // disable that check. This switch is used during automated testing.
 const char kDisablePromptOnRepost[]         = "disable-prompt-on-repost";
 
+// Disables showing the search geolocation disclosure UI. Used for perf testing.
+const char kDisableSearchGeolocationDisclosure[] =
+    "disable-search-geolocation-disclosure";
+
 // Some tests seem to require the application to close when the last
 // browser window is closed. Thus, we need a switch to force this behavior
 // for ChromeOS Aura, disable "zero window mode".
@@ -244,10 +248,15 @@ const char kDiskCacheDir[]                  = "disk-cache-dir";
 // Forces the maximum disk space to be used by the disk cache, in bytes.
 const char kDiskCacheSize[]                 = "disk-cache-size";
 
+const char kDnsLogDetails[]                 = "dns-log-details";
+
 // Requests that a running browser process dump its collected histograms to a
 // given file. The file is overwritten if it exists.
 const char kDumpBrowserHistograms[]         = "dump-browser-histograms";
 
+// Overrides the path of Easy Unlock component app.
+const char kEasyUnlockAppPath[]             = "easy-unlock-app-path";
+
 // Enable auto-reload of error pages.
 const char kEnableAutoReload[] = "enable-auto-reload";
 
@@ -413,6 +422,13 @@ const char kNoServiceAutorun[]              = "no-service-autorun";
 // launching Chrome for the purpose of hosting background apps).
 const char kNoStartupWindow[]               = "no-startup-window";
 
+// Disables checking whether we received an acknowledgment when registering
+// a supervised user. Also disables the timeout during registration that waits
+// for the ack. Useful when debugging against a server that does not
+// support notifications.
+const char kNoSupervisedUserAcknowledgmentCheck[]  =
+    "no-managed-user-acknowledgment-check";
+
 // Calculate the hash of an MHTML file as it is being saved.
 // The browser process will write the serialized MHTML contents to a file and
 // calculate its hash as it is streamed back from the renderer via a Mojo data
@@ -499,6 +515,9 @@ const char kSilentLaunch[]                  = "silent-launch";
 // Simulates a critical update being available.
 const char kSimulateCriticalUpdate[]        = "simulate-critical-update";
 
+// Simulates that elevation is needed to recover upgrade channel.
+const char kSimulateElevatedRecovery[]      = "simulate-elevated-recovery";
+
 // Simulates that current version is outdated.
 const char kSimulateOutdated[]              = "simulate-outdated";
 
@@ -646,6 +665,9 @@ const char kForceShowUpdateMenuItemCustomSummary[] = "custom_summary";
 // Sets the market URL for Chrome for use in testing.
 const char kMarketUrlForTesting[] = "market-url-for-testing";
 
+// Specifies Android phone page loading progress bar animation.
+const char kProgressBarAnimation[]          = "progress-bar-animation";
+
 // Specifies a base URL for the trusted CDN for tests.
 const char kTrustedCDNBaseURLForTests[] = "trusted-cdn-base-url-for-tests";
 
@@ -768,7 +790,7 @@ const char kNotificationLaunchId[] = "notification-launch-id";
 // for the watcher process. Use profiles 5, 6 and 7 as documented on
 // kPrefetchArgument* in content_switches.cc.
 const char kPrefetchArgumentBrowserBackground[] = "/prefetch:5";
-// /prefetch:6 was formerly used by the watcher but is no longer used.
+const char kPrefetchArgumentWatcher[] = "/prefetch:6";
 // /prefetch:7 is used by crashpad, which can't depend on constants defined
 // here. See crashpad_win.cc for more details.
 

chrome/common/chrome_switches.h

@@ -77,10 +77,13 @@ extern const char kDisableExtensionsExcept[];
 extern const char kDisableExtensionsFileAccessCheck[];
 extern const char kDisablePrintPreview[];
 extern const char kDisablePromptOnRepost[];
+extern const char kDisableSearchGeolocationDisclosure[];
 extern const char kDisableZeroBrowsersOpenForTests[];
 extern const char kDiskCacheDir[];
 extern const char kDiskCacheSize[];
+extern const char kDnsLogDetails[];
 extern const char kDumpBrowserHistograms[];
+extern const char kEasyUnlockAppPath[];
 extern const char kEnableAudioDebugRecordingsFromExtension[];
 extern const char kEnableAutoReload[];
 extern const char kEnableBookmarkUndo[];
@@ -126,6 +129,7 @@ extern const char kNoPings[];
 extern const char kNoProxyServer[];
 extern const char kNoServiceAutorun[];
 extern const char kNoStartupWindow[];
+extern const char kNoSupervisedUserAcknowledgmentCheck[];
 extern const char kOnTheFlyMhtmlHashComputation[];
 extern const char kOpenInNewWindow[];
 extern const char kPackExtension[];
@@ -147,6 +151,7 @@ extern const char kShortReportingDelay[];
 extern const char kSilentDebuggerExtensionAPI[];
 extern const char kSilentLaunch[];
 extern const char kSimulateCriticalUpdate[];
+extern const char kSimulateElevatedRecovery[];
 extern const char kSimulateOutdated[];
 extern const char kSimulateOutdatedNoAU[];
 extern const char kSimulateUpgrade[];
@@ -189,6 +194,7 @@ extern const char kForceShowUpdateMenuBadge[];
 extern const char kForceShowUpdateMenuItemCustomSummary[];
 extern const char kForceUpdateMenuType[];
 extern const char kMarketUrlForTesting[];
+extern const char kProgressBarAnimation[];
 extern const char kTrustedCDNBaseURLForTests[];
 extern const char kWebApkServerUrl[];
 #endif  // defined(OS_ANDROID)
@@ -231,6 +237,7 @@ extern const char kNoNetworkProfileWarning[];
 extern const char kNotificationInlineReply[];
 extern const char kNotificationLaunchId[];
 extern const char kPrefetchArgumentBrowserBackground[];
+extern const char kPrefetchArgumentWatcher[];
 extern const char kPwaLauncherVersion[];
 extern const char kShowIcons[];
 extern const char kUninstall[];