Remove some useless extern keywords.

Change-Id: I2a7bbb760833230b662eaa38571e0180b81792c0
Reviewed-on: https://chromium-review.googlesource.com/1213372Reviewed-by: Kevin Bailey <krb@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589575}

chrome/browser/first_run/first_run_browsertest.cc

@@ -133,7 +133,7 @@ int MaskExpectedImportState(int expected_import_state) {
 
 }  // namespace
 
-extern const char kImportDefault[] =
+const char kImportDefault[] =
     "{\n"
     "}\n";
 typedef FirstRunMasterPrefsBrowserTestT<kImportDefault>
@@ -151,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportDefault, MAYBE_ImportDefault) {
             auto_import_state);
 }
 
-extern const char kImportAll[] =
+const char kImportAll[] =
     "{\n"
     "  \"distribution\": {\n"
     "    \"import_bookmarks\": true,\n"
@@ -177,7 +177,7 @@ IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportAll, MAYBE_ImportAll) {
 
 // The bookmarks file doesn't actually need to exist for this integration test
 // to trigger the interaction being tested.
-extern const char kImportBookmarksFile[] =
+const char kImportBookmarksFile[] =
     "{\n"
     "  \"distribution\": {\n"
     "     \"import_bookmarks_from_file\": \"/foo/doesntexists.wtv\"\n"
@@ -203,7 +203,7 @@ IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportBookmarksFile,
 // Test an import with all import options disabled. This is a regression test
 // for http://crbug.com/169984 where this would cause the import process to
 // stay running, and the NTP to be loaded with no apps.
-extern const char kImportNothing[] =
+const char kImportNothing[] =
     "{\n"
     "  \"distribution\": {\n"
     "    \"import_bookmarks\": false,\n"
@@ -230,7 +230,7 @@ IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportNothing,
 }
 
 // Test first run with some tracked preferences.
-extern const char kWithTrackedPrefs[] =
+const char kWithTrackedPrefs[] =
     "{\n"
     "  \"homepage\": \"example.com\",\n"
     "  \"homepage_is_newtabpage\": false\n"

chrome/browser/flag_descriptions.cc

@@ -99,9 +99,9 @@ const char kAutofillPrefilledFieldsName[] = "Autofill Prefilled Fields";
 const char kAutofillPrefilledFieldsDescription[] =
     "Allows autofill to fill fields previously filled by the website";
 
-extern const char kAutofillPreviewStyleExperimentName[] =
+const char kAutofillPreviewStyleExperimentName[] =
     "Autofill Preview Style Experiment";
-extern const char kAutofillPreviewStyleExperimentDescription[] =
+const char kAutofillPreviewStyleExperimentDescription[] =
     "Allows experimentation with the Autofill field preview's style.";
 
 const char kAutofillRationalizeRepeatedServerPredictionsName[] =
@@ -144,8 +144,8 @@ const char kAutoplayPolicyUserGestureRequired[] = "User gesture is required.";
 const char kAutoplayPolicyDocumentUserActivation[] =
     "Document user activation is required.";
 
-extern const char kAv1DecoderName[] = "Enable AV1 video decoding.";
-extern const char kAv1DecoderDescription[] =
+const char kAv1DecoderName[] = "Enable AV1 video decoding.";
+const char kAv1DecoderDescription[] =
     "Allow decoding of files with the AV1 video codec.";
 
 const char kBackgroundVideoTrackOptimizationName[] =
@@ -760,9 +760,9 @@ const char kEnableResourceLoadingHintsDescription[] =
     "Enable using server-provided resource loading hints to provide a preview "
     "over slow network connections.";
 
-extern const char kEnableSyncUserConsentSeparateTypeName[] =
+const char kEnableSyncUserConsentSeparateTypeName[] =
     "Enable separate sync type for consents";
-extern const char kEnableSyncUserConsentSeparateTypeDescription[] =
+const char kEnableSyncUserConsentSeparateTypeDescription[] =
     "Emit user consents as a separate sync type instead of user events.";
 
 const char kEnableSyncUSSBookmarksName[] = "Enable USS for bookmarks sync";
@@ -802,9 +802,9 @@ const char kEnableWebAuthenticationAPIName[] = "Web Authentication API";
 const char kEnableWebAuthenticationAPIDescription[] =
     "Enable Web Authentication API support.";
 
-extern const char kEnableWebAuthenticationCableSupportName[] =
+const char kEnableWebAuthenticationCableSupportName[] =
     "Web Authentication caBLE support";
-extern const char kEnableWebAuthenticationCableSupportDescription[] =
+const char kEnableWebAuthenticationCableSupportDescription[] =
     "Enable the cloud-assisted pairingless BLE protocol for use with "
     "the Web Authentication API.";
 
@@ -1522,9 +1522,9 @@ const char kReducedReferrerGranularityDescription[] =
     "reduce the amount of information in the 'referer' header for cross-origin "
     "requests.";
 
-extern const char kRegionalLocalesAsDisplayUIName[] =
+const char kRegionalLocalesAsDisplayUIName[] =
     "Allow regional locales as display UI";
-extern const char kRegionalLocalesAsDisplayUIDescription[] =
+const char kRegionalLocalesAsDisplayUIDescription[] =
     "This flag allows regional locales to be selected as display UI by the "
     "user in Language Settings. The actual locale of the system is derived "
     "from the user selection based on some simple fallback logic.";
@@ -1602,9 +1602,8 @@ const char kServiceWorkerImportedScriptUpdateCheckDescription[] =
     "Extend byte-for-byte update check for scripts that are imported by the "
     "service worker script via importScripts().";
 
-extern const char kServiceWorkerServicificationName[] =
-    "Servicified service workers";
-extern const char kServiceWorkerServicificationDescription[] =
+const char kServiceWorkerServicificationName[] = "Servicified service workers";
+const char kServiceWorkerServicificationDescription[] =
     "Enable the servicified service workers. A servicified service worker can "
     "have direct connection from its clients, so that fetch events can be "
     "dispatched through the connection without hopping to the browser process.";
@@ -1738,8 +1737,8 @@ const char kSiteIsolationTrialOptOutDescription[] =
     "isolation is force-enabled via #enable-site-per-process or enterprise "
     "policy. Caution: this disables important mitigations for the Spectre CPU "
     "vulnerability affecting most computers.";
-extern const char kSiteIsolationTrialOptOutChoiceDefault[] = "Default";
-extern const char kSiteIsolationTrialOptOutChoiceOptOut[] =
+const char kSiteIsolationTrialOptOutChoiceDefault[] = "Default";
+const char kSiteIsolationTrialOptOutChoiceOptOut[] =
     "Opt-out (not recommended)";
 
 const char kSiteSettings[] = "Site settings";
@@ -3207,13 +3206,12 @@ const char kEnableBackgroundBlurName[] = "Enable background blur.";
 const char kEnableBackgroundBlurDescription[] =
     "Enables background blur for the Peeking Launcher and Tab Switcher.";
 
-extern const char kEnableChromeOsAccountManagerName[] =
-    "Enable Account Manager";
-extern const char kEnableChromeOsAccountManagerDescription[] =
+const char kEnableChromeOsAccountManagerName[] = "Enable Account Manager";
+const char kEnableChromeOsAccountManagerDescription[] =
     "Enables the Chrome OS Account Manager";
 
-extern const char kEnableContinueReadingName[] = "Enable continue reading";
-extern const char kEnableContinueReadingDescription[] =
+const char kEnableContinueReadingName[] = "Enable continue reading";
+const char kEnableContinueReadingDescription[] =
     "Enable continue reading feature in Launcher, which allows users to "
     "seamlessly continue reading a web page when they switch devices from "
     "phones or tablets to Chromebooks.";
@@ -3259,9 +3257,8 @@ const char kEnableHomeLauncherName[] = "Enable home launcher";
 const char kEnableHomeLauncherDescription[] =
     "Enable home launcher in tablet mode.";
 
-extern const char kEnableHomeLauncherGesturesName[] =
-    "Enable home launcher gestures";
-extern const char kEnableHomeLauncherGesturesDescription[] =
+const char kEnableHomeLauncherGesturesName[] = "Enable home launcher gestures";
+const char kEnableHomeLauncherGesturesDescription[] =
     "Enables using gestures to hide or show the home launcher.";
 
 const char kEnableImeMenuName[] = "Enable opt-in IME menu";
@@ -3319,9 +3316,8 @@ const char kEnableVirtualKeyboardUkmName[] = "Enable UKM for virtual keyboard";
 const char kEnableVirtualKeyboardUkmDescription[] =
     "Enables UKM for virtual keyboard";
 
-extern const char kEnableZeroStateSuggestionsName[] =
-    "Enable Zero State Suggetions";
-extern const char kEnableZeroStateSuggestionsDescription[] =
+const char kEnableZeroStateSuggestionsName[] = "Enable Zero State Suggetions";
+const char kEnableZeroStateSuggestionsDescription[] =
     "Enable Zero State Suggestions feature in Launcher, which will show "
     "suggetions when launcher search box is active with an empty query";
 

chrome/common/chrome_features.cc

@@ -249,8 +249,8 @@ const base::Feature kExperimentalAppBanners {
 };
 
 #if defined(OS_CHROMEOS)
-extern const base::Feature kExperimentalCrostiniUI{
-    "ExperimentalCrostiniUI", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kExperimentalCrostiniUI{"ExperimentalCrostiniUI",
+                                            base::FEATURE_DISABLED_BY_DEFAULT};
 #endif
 
 // If enabled, this feature's |kExternalInstallDefaultButtonKey| field trial
@@ -683,10 +683,10 @@ const base::Feature kWebAuthenticationUI{"WebAuthenticationUI",
 // Please note that a Chrome policy must also be set, for this to have effect.
 // Effectively, this is a kill-switch for the feature.
 // TODO(crbug.com/775415): Remove this kill-switch.
-extern const base::Feature kWebRtcRemoteEventLog{
-    "WebRtcRemoteEventLog", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kWebRtcRemoteEventLog{"WebRtcRemoteEventLog",
+                                          base::FEATURE_ENABLED_BY_DEFAULT};
 // Compress remote-bound WebRTC event logs (if used; see kWebRtcRemoteEventLog).
-extern const base::Feature kWebRtcRemoteEventLogGzipped{
+const base::Feature kWebRtcRemoteEventLogGzipped{
     "WebRtcRemoteEventLogGzipped", base::FEATURE_ENABLED_BY_DEFAULT};
 #endif
 

chrome/common/pref_names.cc

@@ -864,7 +864,7 @@ const char kManagedSessionEnabled[] = "managed_session.enabled";
 // Boolean pref indicating whether the user has previously dismissed the
 // one-time notification indicating the need for a cleanup powerwash after TPM
 // firmware update that didn't flush the TPM SRK.
-extern const char kTPMFirmwareUpdateCleanupDismissed[] =
+const char kTPMFirmwareUpdateCleanupDismissed[] =
     "tpm_firmware_update.cleanup_dismissed";
 
 // Boolean pref indicating whether the NetBios Name Query Request Protocol is