1 files changed, 42 insertions, 62 deletions

diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 12c67093acff..edd420c43ba8 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,15 +1,15 @@
---- chrome/browser/about_flags.cc.orig	2019-01-30 02:17:44.000000000 +0100
-+++ chrome/browser/about_flags.cc	2019-01-31 22:07:28.598255000 +0100
-@@ -832,7 +832,7 @@
+--- chrome/browser/about_flags.cc.orig	2019-03-11 22:00:53 UTC
++++ chrome/browser/about_flags.cc
+@@ -749,7 +749,7 @@ const FeatureEntry::FeatureVariation kAutofillPreviewS
      {"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050,
       base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}};
  
 -#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 kAutofillPrimaryInfoStyleMedium[] = {
-     {autofill::kAutofillForcedFontWeightParameterName,
-      autofill::kAutofillForcedFontWeightParameterMedium},
-@@ -859,7 +859,7 @@
+ const FeatureEntry::FeatureParam kPedalSuggestionInSuggestion[] = {
+     {OmniboxFieldTrial::kPedalSuggestionModeParam, "in_suggestion"}};
+ const FeatureEntry::FeatureParam kPedalSuggestionDedicated[] = {
+@@ -760,7 +760,7 @@ const FeatureEntry::FeatureVariation kPedalSuggestionV
      {"Dedicated Suggestion Line", kPedalSuggestionDedicated,
       base::size(kPedalSuggestionDedicated), nullptr},
  };
@@ -18,7 +18,7 @@
  
  const FeatureEntry::Choice kAutoplayPolicyChoices[] = {
      {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -2497,12 +2497,12 @@
+@@ -2362,12 +2362,12 @@ const FeatureEntry kFeatureEntries[] = {
      {"force-text-direction", flag_descriptions::kForceTextDirectionName,
       flag_descriptions::kForceTextDirectionDescription, kOsAll,
       MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -33,9 +33,9 @@
      {"enable-origin-trials", flag_descriptions::kOriginTrialsName,
       flag_descriptions::kOriginTrialsDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -2696,12 +2696,12 @@
-      FEATURE_VALUE_TYPE(
-          password_manager::features::kPasswordsKeyboardAccessory)},
+@@ -2562,12 +2562,12 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)},
+ #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)
@@ -48,25 +48,25 @@
      {"enable-experimental-accessibility-features",
       flag_descriptions::kExperimentalAccessibilityFeaturesName,
       flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
-@@ -3127,7 +3127,7 @@
-      flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kLeftToRightUrls)},
+@@ -3001,7 +3001,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(omnibox::kOmniboxNewAnswerLayout)},
+ #endif  // defined(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)
-     {"omnibox-new-answer-layout",
-      flag_descriptions::kOmniboxNewAnswerLayoutName,
-      flag_descriptions::kOmniboxNewAnswerLayoutDescription, kOsDesktop,
-@@ -3156,7 +3156,7 @@
+     {"omnibox-reverse-answers", flag_descriptions::kOmniboxReverseAnswersName,
+      flag_descriptions::kOmniboxReverseAnswersDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(omnibox::kOmniboxReverseAnswers)},
+@@ -3026,7 +3026,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kOmniboxDriveSuggestionsName,
       flag_descriptions::kOmniboxDriveSuggestionsDescriptions, kOsDesktop,
       FEATURE_VALUE_TYPE(omnibox::kDocumentProvider)},
 -#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
 +#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
  
- #if defined(OS_ANDROID)
-     {"enable-custom-feedback-ui",
-@@ -3449,7 +3449,7 @@
+     {"enable-speculative-service-worker-start-on-query-input",
+      flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
+@@ -3342,7 +3342,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kClickToOpenPDFDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
  
@@ -75,7 +75,7 @@
      {"direct-manipulation-stylus",
       flag_descriptions::kDirectManipulationStylusName,
       flag_descriptions::kDirectManipulationStylusDescription,
-@@ -3460,7 +3460,7 @@
+@@ -3353,7 +3353,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kShowManagedUiDescription,
       kOsWin | kOsMac | kOsLinux | kOsCrOS,
       FEATURE_VALUE_TYPE(features::kShowManagedUi)},
@@ -84,43 +84,7 @@
  
  #if defined(OS_ANDROID)
      {"third-party-doodles", flag_descriptions::kThirdPartyDoodlesName,
-@@ -3897,7 +3897,7 @@
-      flag_descriptions::kAutofillCacheQueryResponsesDescription, kOsAll,
-      FEATURE_VALUE_TYPE(autofill::features::kAutofillCacheQueryResponses)},
- 
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-     {"autofill-primary-info-style",
-      flag_descriptions::kAutofillPrimaryInfoStyleExperimentName,
-      flag_descriptions::kAutofillPrimaryInfoStyleExperimentDescription,
-@@ -3906,7 +3906,7 @@
-          autofill::kAutofillPrimaryInfoStyleExperiment,
-          kAutofillPrimaryInfoStyleVariations,
-          "AutofillPrimaryInfoStyleExperiment")},
--#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- 
-     {"autofill-enable-company-name",
-      flag_descriptions::kAutofillEnableCompanyNameName,
-@@ -4001,7 +4001,7 @@
-      flag_descriptions::kExperimentalProductivityFeaturesDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kExperimentalProductivityFeatures)},
- 
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-     {"ntp-backgrounds", flag_descriptions::kNtpBackgroundsName,
-      flag_descriptions::kNtpBackgroundsDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kNtpBackgrounds)},
-@@ -4017,7 +4017,7 @@
-     {"ntp-ui-md", flag_descriptions::kNtpUIMdName,
-      flag_descriptions::kNtpUIMdDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kNtpUIMd)},
--#endif  // OS_WIN || OS_MACOSX || OS_LINUX
-+#endif  // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
- 
- #if defined(OS_ANDROID)
-     {"enable-display-cutout-api", flag_descriptions::kDisplayCutoutAPIName,
-@@ -4468,7 +4468,7 @@
+@@ -4280,7 +4280,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)},
  #endif  // defined(OS_MACOSX) || defined(OS_CHROMEOS)
  
@@ -129,12 +93,28 @@
      {"autofill-always-show-server-cards-in-sync-transport",
       flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName,
       flag_descriptions::
-@@ -4476,7 +4476,7 @@
+@@ -4288,7 +4288,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsMac | kOsWin | kOsLinux,
       FEATURE_VALUE_TYPE(
           autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)},
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- };
  
- class FlagsStateSingleton {
+ #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX)
+     {"enable-custom-mac-paper-sizes",
+@@ -4333,13 +4333,13 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)},
+ #endif  // OS_CHROMEOS
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"autofill-settings-split-by-card-type",
+      flag_descriptions::kAutofillSettingsSplitByCardTypeName,
+      flag_descriptions::kAutofillSettingsSplitByCardTypeDescription,
+      kOsMac | kOsWin | kOsLinux,
+      FEATURE_VALUE_TYPE(autofill::features::kAutofillSettingsCardTypeSplit)},
+-#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_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+     {"hardware-media-key-handling",