Revert r559792 to unbreak INDEX and bulk -a

It seems a lot of reverse dependencies were missed

With hat:	portmgr

1 files changed, 285 insertions, 0 deletions

diff --git a/devel/electron7/files/patch-chrome_browser_about__flags.cc b/devel/electron7/files/patch-chrome_browser_about__flags.cc
new file mode 100644
index 000000000000..eb35ee59782a
--- /dev/null
+++ b/devel/electron7/files/patch-chrome_browser_about__flags.cc
@@ -0,0 +1,285 @@
+--- chrome/browser/about_flags.cc.orig	2019-12-12 12:39:07 UTC
++++ chrome/browser/about_flags.cc
+@@ -162,7 +162,7 @@
+ #include "ui/gl/gl_switches.h"
+ #include "ui/native_theme/native_theme_features.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/allocator/buildflags.h"
+ #endif
+ 
+@@ -716,7 +716,7 @@ const FeatureEntry::FeatureVariation
+          nullptr}};
+ #endif  // OS_ANDROID
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ const FeatureEntry::FeatureParam
+     kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = {
+         {autofill::features::
+@@ -763,7 +763,7 @@ const FeatureEntry::FeatureVariation
+              kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard),
+          nullptr},
+ };
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ const FeatureEntry::Choice kMemlogModeChoices[] = {
+     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
+@@ -816,7 +816,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
+      heap_profiling::kMemlogSamplingRate5MB},
+ };
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
+     {"DocumentUseServerScore", "true"},
+     {"DocumentUseClientScore", "false"},
+@@ -854,7 +854,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP
+      base::size(kOmniboxDocumentProviderClientScoring), nullptr},
+     {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring,
+      base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}};
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ 
+ const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamNTPOmnibox[] = {
+     {"ZeroSuggestVariant:7:*", ZeroSuggestProvider::kRemoteNoUrlVariant}};
+@@ -932,7 +932,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
+     {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6),
+      nullptr}};
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+ const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = {
+     {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}};
+@@ -948,7 +948,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU
+     {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr},
+     {"Button_GM2", kTranslateBubbleUIButtonGM2,
+      base::size(kTranslateBubbleUIButton), nullptr}};
+-#endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS
++#endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS
+ 
+ const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = {
+     {security_state::features::kMarkHttpAsFeatureParameterName,
+@@ -1849,13 +1849,13 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kCloudPrintXpsDescription, kOsWin,
+      SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
+ #endif  // OS_WIN
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+     {"enable-webgl2-compute-context",
+      flag_descriptions::kWebGL2ComputeContextName,
+      flag_descriptions::kWebGL2ComputeContextDescription,
+      kOsWin | kOsLinux | kOsCrOS,
+      SINGLE_VALUE_TYPE(switches::kEnableWebGL2ComputeContext)},
+-#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+     {"enable-webgl-draft-extensions",
+      flag_descriptions::kWebglDraftExtensionsName,
+      flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
+@@ -1904,14 +1904,14 @@ const FeatureEntry kFeatureEntries[] = {
+                                     "OverrideTranslateTriggerInIndia")},
+ #endif  // OS_ANDROID
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+     {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName,
+      flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop,
+      FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUi,
+                                     kTranslateBubbleUIVariations,
+                                     "UseButtonTranslateBubbleUI")},
+-#endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS
++#endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD
+ 
+ #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS)
+     {"enable-native-notifications",
+@@ -1983,7 +1983,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kCrostiniBackupDescription, kOsCrOS,
+      FEATURE_VALUE_TYPE(chromeos::features::kCrostiniBackup)},
+ #endif  // OS_CHROMEOS
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+     {"terminal-system-app", flag_descriptions::kTerminalSystemAppName,
+      flag_descriptions::kTerminalSystemAppDescription, kOsCrOS | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kTerminalSystemApp)},
+@@ -1992,7 +1992,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux,
+      FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)},
+ #endif  // BUILDFLAG(USE_TCMALLOC)
+-#endif  // OS_CHROMEOS || OS_LINUX
++#endif  // OS_CHROMEOS || OS_LINUX || defined(OS_BSD)
+ #if defined(OS_ANDROID)
+     {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName,
+      flag_descriptions::kCreditCardAssistDescription, kOsAndroid,
+@@ -2075,7 +2075,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(
+          previews::features::kHTTPSServerPreviewsUsingURLLoader)},
+ #endif  // OS_ANDROID
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+     {"enable-save-data", flag_descriptions::kEnableSaveDataName,
+      flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
+      SINGLE_VALUE_TYPE(
+@@ -2427,12 +2427,12 @@ const FeatureEntry kFeatureEntries[] = {
+                                     "AndroidNightMode")},
+ #endif  // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
+ #endif  // OS_ANDROID
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+     {"enable-dbus-and-x11-status-icons",
+      flag_descriptions::kEnableDbusAndX11StatusIconsName,
+      flag_descriptions::kEnableDbusAndX11StatusIconsDescription, kOsLinux,
+      FEATURE_VALUE_TYPE(features::kEnableDbusAndX11StatusIcons)},
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+     {"enable-experimental-accessibility-features",
+      flag_descriptions::kExperimentalAccessibilityFeaturesName,
+      flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
+@@ -2752,7 +2752,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)},
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+     {"omnibox-experimental-keyword-mode",
+      flag_descriptions::kOmniboxExperimentalKeywordModeName,
+      flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
+@@ -2806,7 +2806,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kDocumentProvider,
+                                     kOmniboxDocumentProviderVariations,
+                                     "OmniboxBundledExperimentV1")},
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ 
+     {"enable-speculative-service-worker-start-on-query-input",
+      flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
+@@ -3026,13 +3026,13 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kClickToOpenPDFDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"direct-manipulation-stylus",
+      flag_descriptions::kDirectManipulationStylusName,
+      flag_descriptions::kDirectManipulationStylusDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if !defined(OS_ANDROID)
+     {"chrome-colors", flag_descriptions::kChromeColorsName,
+@@ -3729,7 +3729,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(kClickToCallReceiver)},
+ #endif  // defined(OS_ANDROID)
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+     {"click-to-call-context-menu-selected-text",
+      flag_descriptions::kClickToCallContextMenuForSelectedTextName,
+@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"click-to-call-ui", flag_descriptions::kClickToCallUIName,
+      flag_descriptions::kClickToCallUIDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(kClickToCallUI)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
+         // defined(OS_CHROMEOS)
+ 
+     {"shared-clipboard-receiver",
+@@ -3859,13 +3859,13 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},
+ #endif
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+     {"enable-reopen-tab-in-product-help",
+      flag_descriptions::kReopenTabInProductHelpName,
+      flag_descriptions::kReopenTabInProductHelpDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(feature_engagement::kIPHReopenTabFeature)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
+         // defined(OS_CHROMEOS)
+ 
+     {"enable-audio-focus-enforcement",
+@@ -4245,7 +4245,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kAudioWorkletRealtimeThreadDescription, kOsAll,
+      FEATURE_VALUE_TYPE(blink::features::kAudioWorkletRealtimeThread)},
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"enable-autofill-save-credit-card-uses-improved-messaging",
+      flag_descriptions::kEnableAutofillSaveCreditCardUsesImprovedMessagingName,
+      flag_descriptions::
+@@ -4255,7 +4255,7 @@ const FeatureEntry kFeatureEntries[] = {
+          autofill::features::kAutofillSaveCreditCardUsesImprovedMessaging,
+          kAutofillSaveCreditCardUsesImprovedMessagingVariations,
+          "AutofillSaveCreditCardUsesImprovedMessaging")},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if defined(OS_CHROMEOS)
+     {"release-notes", flag_descriptions::kReleaseNotesName,
+@@ -4337,12 +4337,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll,
+      FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)},
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"global-media-controls", flag_descriptions::kGlobalMediaControlsName,
+      flag_descriptions::kGlobalMediaControlsDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(media::kGlobalMediaControls)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)
+     {"win-use-native-spellchecker",
+@@ -4355,12 +4355,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kSafetyTipDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kSafetyTipUI)},
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"animated-avatar-button", flag_descriptions::kAnimatedAvatarButtonName,
+      flag_descriptions::kAnimatedAvatarButtonDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kAnimatedAvatarButton)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if defined(OS_CHROMEOS)
+     {"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName,
+@@ -4484,12 +4484,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kBundledHTTPExchangesDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kBundledHTTPExchanges)},
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"profile-menu-revamp", flag_descriptions::kProfileMenuRevampName,
+      flag_descriptions::kProfileMenuRevampDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kProfileMenuRevamp)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+     {"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName,
+      flag_descriptions::kPasswordLeakDetectionDescription, kOsAll,
+@@ -4543,11 +4543,11 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(content_settings::kImprovedCookieControls)},
+ #endif  // !defined(OS_ANDROID)
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"sync-clipboard-service", flag_descriptions::kSyncClipboardServiceName,
+      flag_descriptions::kSyncClipboardServiceDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(features::kSyncClipboardServiceFeature)},
+-#endif  // OS_WIN || OS_MACOSX || OS_LINUX
++#endif  // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
+ 
+ #if defined(OS_ANDROID)
+     {"enable-clipboard-provider-text-suggestions",