1 files changed, 19 insertions, 96 deletions

diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index ed5d7f413cf4..399578ffb714 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig	2019-12-16 21:51:23 UTC
+--- chrome/browser/about_flags.cc.orig	2020-03-03 18:53:51 UTC
 +++ chrome/browser/about_flags.cc
-@@ -164,7 +164,7 @@
+@@ -166,7 +166,7 @@
  #include "ui/gl/gl_switches.h"
  #include "ui/native_theme/native_theme_features.h"
  
@@ -9,25 +9,7 @@
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -715,7 +715,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::
-@@ -762,7 +762,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, "", ""},
-@@ -815,7 +815,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
+@@ -804,7 +804,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
       heap_profiling::kMemlogSamplingRate5MB},
  };
  
@@ -36,34 +18,16 @@
  const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
      {"DocumentUseServerScore", "true"},
      {"DocumentUseClientScore", "false"},
-@@ -853,7 +853,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)
- 
- #ifdef OS_ANDROID
- const FeatureEntry::FeatureParam kOmniboxNTPZPSLocal[] = {
-@@ -967,7 +967,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
+@@ -956,7 +956,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}};
-@@ -983,7 +983,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,
-@@ -1913,13 +1913,13 @@ const FeatureEntry kFeatureEntries[] = {
+ const FeatureEntry::FeatureParam kTranslateBubbleUITab[] = {
+     {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleTabValue}};
+@@ -1981,13 +1981,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kCloudPrintXpsDescription, kOsWin,
       SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
  #endif  // OS_WIN
@@ -79,7 +43,7 @@
      {"enable-webgl-draft-extensions",
       flag_descriptions::kWebglDraftExtensionsName,
       flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
-@@ -1971,14 +1971,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2031,14 +2031,14 @@ const FeatureEntry kFeatureEntries[] = {
                                      "OverrideTranslateTriggerInIndia")},
  #endif  // OS_ANDROID
  
@@ -96,16 +60,7 @@
  
  #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS)
      {"enable-native-notifications",
-@@ -2044,7 +2044,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)},
-@@ -2053,7 +2053,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2119,7 +2119,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)},
  #endif  // BUILDFLAG(USE_TCMALLOC)
@@ -114,7 +69,7 @@
  #if defined(OS_ANDROID)
      {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName,
       flag_descriptions::kCreditCardAssistDescription, kOsAndroid,
-@@ -2131,7 +2131,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2197,7 +2197,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)},
  #endif  // OS_ANDROID
@@ -123,16 +78,16 @@
      {"enable-save-data", flag_descriptions::kEnableSaveDataName,
       flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
       SINGLE_VALUE_TYPE(
-@@ -2810,7 +2810,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)},
+@@ -2858,7 +2858,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kOmniboxExperimentalSuggestScoringDescription, kOsAll,
+      FEATURE_VALUE_TYPE(omnibox::kOmniboxExperimentalSuggestScoring)},
  
 -#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,
-@@ -2850,7 +2850,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2903,7 +2903,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kOmniboxAutocompleteTitlesName,
       flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)},
@@ -141,7 +96,7 @@
  
      {"enable-speculative-service-worker-start-on-query-input",
       flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
-@@ -3084,13 +3084,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3136,13 +3136,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kClickToOpenPDFDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
  
@@ -157,7 +112,7 @@
  
  #if !defined(OS_ANDROID)
      {"chrome-colors", flag_descriptions::kChromeColorsName,
-@@ -3889,13 +3889,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3965,13 +3965,13 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},
  #endif
  
@@ -173,25 +128,7 @@
          // defined(OS_CHROMEOS)
  
      {"enable-audio-focus-enforcement",
-@@ -4269,7 +4269,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::
-@@ -4279,7 +4279,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,
-@@ -4367,12 +4367,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4425,12 +4425,12 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll,
       FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)},
  
@@ -206,7 +143,7 @@
  
  #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)
      {"win-use-native-spellchecker",
-@@ -4385,12 +4385,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4450,12 +4450,12 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSafetyTipDescription, kOsAll,
       FEATURE_VALUE_TYPE(security_state::features::kSafetyTipUI)},
  
@@ -221,7 +158,7 @@
  
  #if defined(OS_CHROMEOS)
      {"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName,
-@@ -4526,12 +4526,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4587,12 +4587,12 @@ const FeatureEntry kFeatureEntries[] = {
           chrome::android::kDarkenWebsitesCheckboxInThemesSetting)},
  #endif  // defined(OS_ANDROID)
  
@@ -236,17 +173,3 @@
  
      {"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName,
       flag_descriptions::kPasswordLeakDetectionDescription, kOsAll,
-@@ -4605,11 +4605,11 @@ const FeatureEntry kFeatureEntries[] = {
-          content_settings::kImprovedCookieControlsForThirdPartyCookieBlocking)},
- #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)
-     {"accessibility-internals-page-improvements",