1 files changed, 40 insertions, 42 deletions

diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index edd420c43ba8..3aca9b080313 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,24 +1,22 @@
---- chrome/browser/about_flags.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/about_flags.cc.orig	2019-04-30 22:22:32 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 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},
- };
--#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::Choice kAutoplayPolicyChoices[] = {
-     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -2362,12 +2362,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1615,13 +1615,13 @@ const FeatureEntry kFeatureEntries[] = {
+      SINGLE_VALUE_TYPE(
+          spellcheck::switches::kEnableSpellingFeedbackFieldTrial)},
+ #endif  // ENABLE_SPELLCHECK
+-#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,
+@@ -2128,12 +2128,12 @@ const FeatureEntry kFeatureEntries[] = {
      {"force-text-direction", flag_descriptions::kForceTextDirectionName,
       flag_descriptions::kForceTextDirectionDescription, kOsAll,
       MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -33,7 +31,7 @@
      {"enable-origin-trials", flag_descriptions::kOriginTrialsName,
       flag_descriptions::kOriginTrialsDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -2562,12 +2562,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2321,12 +2321,12 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)},
  #endif  // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
  #endif  // OS_ANDROID
@@ -48,25 +46,25 @@
      {"enable-experimental-accessibility-features",
       flag_descriptions::kExperimentalAccessibilityFeaturesName,
       flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
-@@ -3001,7 +3001,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(omnibox::kOmniboxNewAnswerLayout)},
- #endif  // defined(OS_ANDROID)
+@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kOmniboxRichEntitySuggestionsDescription, kOsAll,
+      FEATURE_VALUE_TYPE(omnibox::kOmniboxRichEntitySuggestions)},
  
 -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
 +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-     {"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)},
+     {"omnibox-experimental-keyword-mode",
+      flag_descriptions::kOmniboxExperimentalKeywordModeName,
+      flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
+@@ -2716,7 +2716,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kOmniboxDeduplicateDriveUrlsName,
+      flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)},
 -#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,
-@@ -3342,7 +3342,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3040,7 +3040,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kClickToOpenPDFDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
  
@@ -75,16 +73,16 @@
      {"direct-manipulation-stylus",
       flag_descriptions::kDirectManipulationStylusName,
       flag_descriptions::kDirectManipulationStylusDescription,
-@@ -3353,7 +3353,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kShowManagedUiDescription,
-      kOsWin | kOsMac | kOsLinux | kOsCrOS,
-      FEATURE_VALUE_TYPE(features::kShowManagedUi)},
+@@ -3057,7 +3057,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kLinkManagedNoticeToChromeUIManagementURLDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kLinkManagedNoticeToChromeUIManagementURL)},
 -#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)
-     {"third-party-doodles", flag_descriptions::kThirdPartyDoodlesName,
-@@ -4280,7 +4280,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #if !defined(OS_ANDROID)
+     {"doodles-on-local-ntp", flag_descriptions::kDoodlesOnLocalNtpName,
+@@ -3940,7 +3940,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)},
  #endif  // defined(OS_MACOSX) || defined(OS_CHROMEOS)
  
@@ -93,7 +91,7 @@
      {"autofill-always-show-server-cards-in-sync-transport",
       flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName,
       flag_descriptions::
-@@ -4288,7 +4288,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3948,7 +3948,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsMac | kOsWin | kOsLinux,
       FEATURE_VALUE_TYPE(
           autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)},
@@ -102,7 +100,7 @@
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX)
      {"enable-custom-mac-paper-sizes",
-@@ -4333,13 +4333,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3993,13 +3993,13 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)},
  #endif  // OS_CHROMEOS
  
@@ -116,5 +114,5 @@
 -#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)
+ #if !defined(OS_ANDROID)
      {"hardware-media-key-handling",