Release 99.0.4844.55

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 99.0.4844.55
+* flag to enable Certificate Transparency (thanks to @uazo)
+* allow adding search engines from incognito mode
+* disable all predictors code (thanks to @uazo)
+* disable safety check
+* revert allow block of view-source URLs
+* JIT toggle site setting (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1720 and https://github.com/bromite/bromite/issues/1819)
+* move always incognito preference to native (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1496 and https://github.com/bromite/bromite/issues/1568)
+* remove patch to add data saver header
+* close a potential security issue with user scripts on native pages (thanks to @uazo)
+* disable safety checks and possible Omaha interactions
+* disable SegmentationPlatformFeature and Optimization Hints (thanks to @uazo)
+
 # 98.0.4758.116
 * disable minidumps upload
 * complete disabling of client hint headers (thanks to @uazo)

build/bromite_patches_list.txt

@@ -108,7 +108,7 @@ Disable-smart-selection-by-default.patch
 Enable-user-agent-freeze-by-default.patch
 disable-browser-autologin-by-default.patch
 AImageReader-CFI-crash-mitigations.patch
-Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch
+Keep-flag-to-allow-screenshots-in-Incognito-mode.patch
 Add-menu-item-to-view-source.patch
 Block-gateway-attacks-via-websockets.patch
 Enable-prefetch-privacy-changes-by-default.patch
@@ -178,9 +178,9 @@ Disable-idle-detection.patch
 Allow-building-without-supervised-users.patch
 Disable-minidump-upload-scheduling.patch
 Revert-Permit-blocking-of-view-source-with-URLBlocklist.patch
-Update-i18n-zh_CN-support.patch
-Automated-domain-substitution.patch
 Disable-safety-check.patch
 Disable-all-predictors-code.patch
 Allow-adding-search-engines-from-incognito-mode.patch
 Enable-Certificate-Transparency.patch
+Update-i18n-zh_CN-support.patch
+Automated-domain-substitution.patch

build/patches/Add-IsCleartextPermitted-flag.patch

@@ -14,7 +14,7 @@ Subject: Add IsCleartextPermitted flag
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7727,6 +7727,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7724,6 +7724,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kRequestDesktopSiteExceptionsName,
       flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1456,6 +1456,10 @@ const char kHttpsOnlyModeDescription[] =
+@@ -1451,6 +1451,10 @@ const char kHttpsOnlyModeDescription[] =
      "Adds a setting under chrome://settings/security to opt-in to HTTPS-First "
      "Mode.";
  
@@ -42,7 +42,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -839,6 +839,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
+@@ -836,6 +836,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
  extern const char kHttpsOnlyModeName[];
  extern const char kHttpsOnlyModeDescription[];
  

build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch

@@ -1,97 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 9 May 2020 08:33:15 +0200
-Subject: Add a flag to allow screenshots in Incognito mode
-
-See also:
-* https://github.com/bromite/bromite/issues/551
-* https://bugs.chromium.org/p/chromium/issues/detail?id=920762
----
- chrome/browser/about_flags.cc                                | 3 +++
- chrome/browser/flag_descriptions.cc                          | 5 +++++
- chrome/browser/flag_descriptions.h                           | 3 +++
- .../flags/android/java_templates/ChromeSwitches.java.tmpl    | 4 ----
- chrome/common/chrome_switches.cc                             | 3 +++
- chrome/common/chrome_switches.h                              | 1 +
- 6 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
---- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -7410,6 +7410,9 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kDynamicColorAndroid,
-                                     kDynamicColorAndroidVariations,
-                                     "AndroidDynamicColor")},
-+    {switches::kEnableIncognitoSnapshotsInAndroidRecents, flag_descriptions::kEnableIncognitoSnapshotsInAndroidRecentsName,
-+     flag_descriptions::kEnableIncognitoSnapshotsInAndroidRecentsDescription, kOsAndroid,
-+     SINGLE_VALUE_TYPE(switches::kEnableIncognitoSnapshotsInAndroidRecents)},
- #endif  //   BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN)
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
---- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -697,6 +697,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] =
-     "authenticator (if available) to verify card ownership when retrieving "
-     "credit cards from Google Payments.";
- 
-+const char kEnableIncognitoSnapshotsInAndroidRecentsName[] =
-+    "Enable Incognito snapshots in Android Recents";
-+const char kEnableIncognitoSnapshotsInAndroidRecentsDescription[] =
-+    "Enable the secure flag for Incognito tabs which prevent taking screenshots and seeing snapshots in Android Recents.";
-+
- const char
-     kEnableAutofillInfoBarAccountIndicationFooterForSingleAccountUsersName[] =
-         "Display InfoBar footers with account indication information for "
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
---- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -431,6 +431,9 @@ extern const char kEnableAutofillSaveCardInfoBarAccountIndicationFooterName[];
- extern const char
-     kEnableAutofillSaveCardInfoBarAccountIndicationFooterDescription[];
- 
-+extern const char kEnableIncognitoSnapshotsInAndroidRecentsName[];
-+extern const char kEnableIncognitoSnapshotsInAndroidRecentsDescription[];
-+
- extern const char kEnableExperimentalCookieFeaturesName[];
- extern const char kEnableExperimentalCookieFeaturesDescription[];
- 
-diff --git a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl
---- a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl
-+++ b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl
-@@ -123,10 +123,6 @@ public abstract class ChromeSwitches {{
-     /** Switch for enabling the Chrome Survey. Only works when UMA is accepted. */
-     public static final String CHROME_FORCE_ENABLE_SURVEY = "force-enable-chrome-survey";
- 
--    /** Switch to enable incognito tabs to be seen in Android Recents. */
--    public static final String ENABLE_INCOGNITO_SNAPSHOTS_IN_ANDROID_RECENTS =
--            "enable-incognito-snapshots-in-android-recents";
--
-     /** Open all custom tabs in a new task. Used only for experimental purposes. */
-     public static final String OPEN_CUSTOM_TABS_IN_NEW_TASK = "open-custom-tabs-in-new-task";
- 
-diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
---- a/chrome/common/chrome_switches.cc
-+++ b/chrome/common/chrome_switches.cc
-@@ -321,6 +321,9 @@ const char kHomePage[]                      = "homepage";
- // Causes the browser to launch directly in incognito mode.
- const char kIncognito[]                     = "incognito";
- 
-+// Allows incognito tabs to be seen in Android Recents and thus user screenshots.
-+const char kEnableIncognitoSnapshotsInAndroidRecents[] = "enable-incognito-snapshots-in-android-recents";
-+
- // Installs an autogenerated theme based on the given RGB value.
- // The format is "r,g,b", where r, g, b are a numeric values from 0 to 255.
- const char kInstallAutogeneratedTheme[] = "install-autogenerated-theme";
-diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
---- a/chrome/common/chrome_switches.h
-+++ b/chrome/common/chrome_switches.h
-@@ -107,6 +107,7 @@ extern const char kForceFirstRun[];
- extern const char kHideCrashRestoreBubble[];
- extern const char kHomePage[];
- extern const char kIncognito[];
-+extern const char kEnableIncognitoSnapshotsInAndroidRecents[];
- extern const char kInstallAutogeneratedTheme[];
- extern const char kInstallChromeApp[];
- extern const char kInstantProcess[];
---
-2.25.1

build/patches/Add-flag-to-disable-external-intent-requests.patch

@@ -24,7 +24,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3308,6 +3308,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support";
+@@ -3303,6 +3303,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support";
  const char kPhotoPickerVideoSupportDescription[] =
      "Enables video files to be shown in the Photo Picker dialog";
  
@@ -40,7 +40,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1910,6 +1910,9 @@ extern const char kQueryTilesNTPDescription[];
+@@ -1907,6 +1907,9 @@ extern const char kQueryTilesNTPDescription[];
  extern const char kQueryTilesOmniboxName[];
  extern const char kQueryTilesOmniboxDescription[];
  extern const char kQueryTilesSingleTierName[];

build/patches/Add-flag-to-disable-vibration.patch

@@ -32,7 +32,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -5326,6 +5326,9 @@ const char kDefaultCalculatorWebAppDescription[] =
+@@ -5321,6 +5321,9 @@ const char kDefaultCalculatorWebAppDescription[] =
      "chrome app.";
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -45,7 +45,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -3226,6 +3226,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
+@@ -3223,6 +3223,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
  extern const char kWebUITabStripTabDragIntegrationDescription[];
  #endif  // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)
  

build/patches/Automated-domain-substitution.patch

@@ -5963,7 +5963,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
  const char kDisableProcessReuse[] = "Disable subframe process reuse";
  const char kDisableProcessReuseDescription[] =
-@@ -2134,7 +2134,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header";
+@@ -2129,7 +2129,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header";
  const char kReduceUserAgentDescription[] =
      "Reduce (formerly, \"freeze\") the amount of information available in "
      "the User-Agent request header. "
@@ -5972,7 +5972,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
  const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
  const char kRestrictGamepadAccessDescription[] =
-@@ -2151,7 +2151,7 @@ const char kIntensiveWakeUpThrottlingName[] =
+@@ -2146,7 +2146,7 @@ const char kIntensiveWakeUpThrottlingName[] =
  const char kIntensiveWakeUpThrottlingDescription[] =
      "When enabled, wake ups from DOM Timers are limited to 1 per minute in a "
      "page that has been hidden for 5 minutes. For additional details, see "

build/patches/Bromite-auto-updater.patch

@@ -22,11 +22,11 @@ Enable checking for new versions, with notifications and proxy support
  .../endpoint_fetcher/endpoint_fetcher.h       |  22 +-
  .../endpoint_fetcher/EndpointFetcher.java     |  22 +-
  .../EndpointHeaderResponse.java               |  31 +++
- .../flags/android/chrome_feature_list.cc      |   6 +-
+ .../flags/android/chrome_feature_list.cc      |   4 +
  .../flags/android/chrome_feature_list.h       |   1 +
  .../browser/flags/ChromeFeatureList.java      |   1 +
  .../strings/android_chrome_strings.grd        |  23 +-
- 22 files changed, 896 insertions(+), 56 deletions(-)
+ 22 files changed, 895 insertions(+), 55 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
@@ -1517,18 +1517,16 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kPageAnnotationsService,
      &kBookmarksImprovedSaveFlow,
      &kBookmarksRefresh,
-@@ -680,7 +681,10 @@ const base::Feature kIncognitoReauthenticationForAndroid{
-     "IncognitoReauthenticationForAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
- 
+@@ -682,6 +683,9 @@ const base::Feature kIncognitoReauthenticationForAndroid{
  const base::Feature kIncognitoScreenshot{"IncognitoScreenshot",
--                                         base::FEATURE_DISABLED_BY_DEFAULT};
-+                                         base::FEATURE_ENABLED_BY_DEFAULT};
-+
+                                          base::FEATURE_DISABLED_BY_DEFAULT};
+ 
 +const base::Feature kInlineUpdateFlow{"InlineUpdateFlow",
 +                                      base::FEATURE_ENABLED_BY_DEFAULT};
- 
++
  const base::Feature kInstantStart{"InstantStart",
                                    base::FEATURE_DISABLED_BY_DEFAULT};
+ 
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -1574,7 +1572,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 -        Update Chrome
 +        Update Bromite
 +      </message>
-+      <message name="IDS_MENU_UPDATE_VULNERABLE" desc="Content description for the menu button when it is covered by the update icon that is displayed when the current version of Bromite is vulnerable.">
++      <message name="IDS_MENU_UPDATE_SUMMARY_VULNERABLE" desc="Content description for the menu button when it is covered by the update icon that is displayed when the current version of Bromite is vulnerable.">
 +        Update not available. Read more
        </message>
        <message name="IDS_MENU_UPDATE_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that a newer version of Chrome is available. [CHAR_LIMIT=30]">

build/patches/Disable-text-fragments-by-default.patch

@@ -49,7 +49,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1227,6 +1227,10 @@ const char kEnableRestrictedWebApisDescription[] =
+@@ -1222,6 +1222,10 @@ const char kEnableRestrictedWebApisDescription[] =
      "Enable the restricted web APIs for dev trial. This will be replaced with "
      "permission policies to control the capabilities afterwards.";
  
@@ -63,7 +63,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -700,6 +700,9 @@ extern const char
+@@ -697,6 +697,9 @@ extern const char
  extern const char kEnableRestrictedWebApisName[];
  extern const char kEnableRestrictedWebApisDescription[];
  

build/patches/Enable-Certificate-Transparency.patch

@@ -22,7 +22,7 @@ Disable CT reporting
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7683,6 +7683,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7680,6 +7680,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWebBluetoothBondOnDemandDescription, kOsWin | kOsLinux,
       FEATURE_VALUE_TYPE(features::kWebBluetoothBondOnDemand)},
  
@@ -62,7 +62,7 @@ diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.c
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -5580,6 +5580,10 @@ const char kUIDebugToolsDescription[] =
+@@ -5575,6 +5575,10 @@ const char kUIDebugToolsDescription[] =
      "Enables additional keyboard shortcuts to help debugging.";
  #endif
  
@@ -76,7 +76,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -3253,6 +3253,9 @@ extern const char kUIDebugToolsName[];
+@@ -3250,6 +3250,9 @@ extern const char kUIDebugToolsName[];
  extern const char kUIDebugToolsDescription[];
  #endif
  

build/patches/Enable-share-intent.patch

@@ -322,7 +322,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2268,6 +2268,11 @@ const char kIsolateOriginsDescription[] =
+@@ -2263,6 +2263,11 @@ const char kIsolateOriginsDescription[] =
      "Requires dedicated processes for an additional set of origins, "
      "specified as a comma-separated list.";
  
@@ -337,7 +337,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1316,6 +1316,9 @@ extern const char kIsolateOriginsDescription[];
+@@ -1313,6 +1313,9 @@ extern const char kIsolateOriginsDescription[];
  
  extern const char kIsolationByDefaultName[];
  extern const char kIsolationByDefaultDescription[];

build/patches/Experimental-user-scripts-support.patch

@@ -372,7 +372,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -5434,6 +5434,11 @@ const char kImproveAccessibilityTreeUsingLocalMLDescription[] =
+@@ -5429,6 +5429,11 @@ const char kImproveAccessibilityTreeUsingLocalMLDescription[] =
      "webpage to a local machine learning library and getting annotations.";
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  
@@ -387,7 +387,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -3148,6 +3148,9 @@ extern const char kImproveAccessibilityTreeUsingLocalMLName[];
+@@ -3145,6 +3145,9 @@ extern const char kImproveAccessibilityTreeUsingLocalMLName[];
  extern const char kImproveAccessibilityTreeUsingLocalMLDescription[];
  #endif  // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  

build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch

@@ -0,0 +1,30 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 9 May 2020 08:33:15 +0200
+Subject: Keep flag to allow screenshots in Incognito mode
+
+See also:
+* https://github.com/bromite/bromite/issues/551
+* https://github.com/bromite/bromite/issues/1816
+* https://bugs.chromium.org/p/chromium/issues/detail?id=920762
+---
+ chrome/browser/flag-metadata.json | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
+--- a/chrome/browser/flag-metadata.json
++++ b/chrome/browser/flag-metadata.json
+@@ -3577,9 +3577,9 @@
+     "expiry_milestone": 100
+   },
+   {
+-    "name": "incognito-screenshot",
+-    "owners": [ "roagarwal", "sideyilmaz", "chrome-incognito@google.com" ],
+-    "expiry_milestone": 110
++    "name": "incognito-screenshot",                                          // Bromite: guard this feature flag
++    "owners": [ "roagarwal", "sideyilmaz", "chrome-incognito@google.com" ],  // -
++    "expiry_milestone": -1                                                   // -
+   },
+   {
+     "name": "inherit-native-theme-from-parent-widget",
+--
+2.25.1

build/patches/Restore-Simplified-NTP-launch.patch

@@ -323,7 +323,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3489,6 +3489,9 @@ const char kStartSurfaceAndroidDescription[] =
+@@ -3484,6 +3484,9 @@ const char kStartSurfaceAndroidDescription[] =
      "Enable showing the start surface when launching Chrome via the "
      "launcher.";
  
@@ -336,7 +336,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1997,6 +1997,9 @@ extern const char kSiteIsolationForPasswordSitesDescription[];
+@@ -1994,6 +1994,9 @@ extern const char kSiteIsolationForPasswordSitesDescription[];
  extern const char kSmartSuggestionForLargeDownloadsName[];
  extern const char kSmartSuggestionForLargeDownloadsDescription[];
  

build/patches/Revert-flags-remove-num-raster-threads.patch

@@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1660,6 +1660,14 @@ const char kOmniboxActiveSearchEnginesDescription[] =
+@@ -1655,6 +1655,14 @@ const char kOmniboxActiveSearchEnginesDescription[] =
      "Enables a 'Your Search Engines' section on "
      "chrome://settings/searchEngines.";
  
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -966,6 +966,13 @@ extern const char kNotificationsSystemFlagDescription[];
+@@ -963,6 +963,13 @@ extern const char kNotificationsSystemFlagDescription[];
  extern const char kOmniboxActiveSearchEnginesName[];
  extern const char kOmniboxActiveSearchEnginesDescription[];