1 files changed, 23 insertions, 39 deletions
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index aef1d325eaa1..40a20edecf65 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	2020-08-18 18:40:04 UTC
+--- chrome/browser/about_flags.cc.orig	2020-09-08 19:13:59 UTC
 +++ chrome/browser/about_flags.cc
-@@ -179,7 +179,7 @@
+@@ -184,7 +184,7 @@
  #include "ui/gl/gl_switches.h"
  #include "ui/native_theme/native_theme_features.h"
  
@@ -9,7 +9,7 @@
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -879,7 +879,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
+@@ -840,7 +840,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
       heap_profiling::kMemlogSamplingRate5MB},
  };
  
@@ -18,7 +18,7 @@
  const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
      {"DocumentUseServerScore", "true"},
      {"DocumentUseClientScore", "false"},
-@@ -1044,7 +1044,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc
+@@ -1005,7 +1005,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc
          nullptr,
      }};
  
@@ -27,7 +27,7 @@
  
  const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = {
      {"ZeroSuggestVariant:6:*", "RemoteSendUrl"},
-@@ -2485,13 +2485,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2495,13 +2495,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kCloudPrintXpsDescription, kOsWin,
       SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
  #endif  // OS_WIN
@@ -43,23 +43,7 @@
      {"enable-webgl-draft-extensions",
       flag_descriptions::kWebglDraftExtensionsName,
       flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
-@@ -2614,13 +2614,13 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kTerminalSystemAppSplitsDescription, kOsCrOS,
-      FEATURE_VALUE_TYPE(features::kTerminalSystemAppSplits)},
- #endif  // OS_CHROMEOS
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
- #if BUILDFLAG(USE_TCMALLOC)
-     {"dynamic-tcmalloc-tuning", flag_descriptions::kDynamicTcmallocName,
-      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,
-@@ -2675,7 +2675,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2689,7 +2689,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)},
  #endif  // OS_ANDROID
@@ -68,7 +52,7 @@
      {"enable-save-data", flag_descriptions::kEnableSaveDataName,
       flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux,
       SINGLE_VALUE_TYPE(
-@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2699,7 +2699,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableNavigationPredictorDescription,
       kOsCrOS | kOsLinux,
       FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)},
@@ -77,7 +61,7 @@
      {"enable-preconnect-to-search",
       flag_descriptions::kEnablePreconnectToSearchName,
       flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll,
-@@ -3403,7 +3403,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3437,7 +3437,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           omnibox::kHistoryQuickProviderAllowMidwordContinuations)},
  
@@ -86,7 +70,7 @@
      {"omnibox-experimental-keyword-mode",
       flag_descriptions::kOmniboxExperimentalKeywordModeName,
       flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -3458,7 +3458,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3487,7 +3487,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kRichAutocompletion,
                                      kOmniboxRichAutocompletionVariations,
                                      "OmniboxBundledExperimentV1")},
@@ -95,7 +79,7 @@
  
      {"enable-speculative-service-worker-start-on-query-input",
       flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
-@@ -3674,13 +3674,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3731,13 +3731,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kClickToOpenPDFDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
  
@@ -111,7 +95,7 @@
  
  #if !defined(OS_ANDROID)
      {"ntp-confirm-suggestion-removals",
-@@ -4365,7 +4365,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4423,7 +4423,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(kClickToCallUI)},
  #endif  // BUILDFLAG(ENABLE_CLICK_TO_CALL)
  
@@ -120,7 +104,7 @@
      defined(OS_CHROMEOS)
      {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName,
       flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop,
-@@ -4382,7 +4382,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4440,7 +4440,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kRemoteCopyProgressNotificationName,
       flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)},
@@ -129,7 +113,7 @@
          // defined(OS_CHROMEOS)
  
      {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName,
-@@ -4408,7 +4408,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4466,7 +4466,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           send_tab_to_self::kSendTabToSelfOmniboxSendingAnimation)},
  
@@ -138,16 +122,16 @@
      defined(OS_CHROMEOS)
      {"sharing-peer-connection-receiver",
       flag_descriptions::kSharingPeerConnectionReceiverName,
-@@ -4419,7 +4419,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4477,7 +4477,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSharingPeerConnectionSenderName,
       flag_descriptions::kSharingPeerConnectionSenderDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(kSharingPeerConnectionSender)},
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
-+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
          // defined(OS_CHROMEOS)
  
      {"sharing-prefer-vapid", flag_descriptions::kSharingPreferVapidName,
-@@ -4494,13 +4494,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4552,13 +4552,13 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},
  #endif
  
@@ -163,19 +147,19 @@
          // defined(OS_CHROMEOS)
  
      {"enable-audio-focus-enforcement",
-@@ -4941,7 +4941,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll,
-      FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)},
+@@ -5020,7 +5020,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableSyncTrustedVaultDescription, kOsAll,
+      FEATURE_VALUE_TYPE(switches::kSyncSupportTrustedVaultPassphrase)},
  
 -#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,
-@@ -4958,7 +4958,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kGlobalMediaControlsPictureInPictureDescription,
-      kOsWin | kOsMac | kOsLinux | kOsCrOS,
-      FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)},
+@@ -5043,7 +5043,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kGlobalMediaControlsSeamlessTransferDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(media::kGlobalMediaControlsSeamlessTransfer)},
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)