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, and add
a comment about how to avoid pitfalls in future cleanups.

Bug: 1130298
Change-Id: I7070fe6b8bd8044551e37979f0ebb7bf0e58fc75
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2421440
Commit-Queue: Eric Lawrence [MSFT] <ericlaw@microsoft.com>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809141}

chrome/common/chrome_switches.cc

@@ -229,10 +229,6 @@ 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".
@@ -248,15 +244,10 @@ 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";
 
@@ -422,13 +413,6 @@ 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
@@ -665,9 +649,6 @@ 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";
 
@@ -790,7 +771,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";
-const char kPrefetchArgumentWatcher[] = "/prefetch:6";
+// /prefetch:6 was formerly used by the watcher but is no longer used.
 // /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

@@ -25,6 +25,12 @@ namespace switches {
 // media/base/media_switches.cc or ui/gl/gl_switches.cc or one of the
 // .cc files corresponding to the *_switches.h files included above
 // instead.
+//
+// Want to remove obsolete switches? Ensure that the switch isn't still in use
+// by the Android Java code (ChromeSwitches.java.tmpl) under an aliased name.
+// Also perform a string search to make sure the switch isn't in use only by a
+// build-configuration, e.g. BUILDFLAG(GOOGLE_CHROME_BRANDING), that is not
+// indexed for cross-reference or built by the CQ bots.
 // -----------------------------------------------------------------------------
 
 // All switches in alphabetical order. The switches should be documented
@@ -77,13 +83,10 @@ 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[];
@@ -129,7 +132,6 @@ 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[];
@@ -194,7 +196,6 @@ 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)
@@ -237,7 +238,6 @@ 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[];