Browser: Bump to 116.0.5845.163

Do-not-link-with-libatomic.patch

do-not-add-suffix-to-package-name.patch

exit-on-failure-of-inclusion.patch

Disable-safe-browsing.patch

Remove-signin-and-sync-integrations.patch

Move-some-account-settings-back-to-privacy-settings.patch

Remove-contextual-search-manager.patch

kill-Vision.patch

kill-Location-fall-back-to-system.patch

kill-Auth.patch

Remove-binary-blob-integrations.patch

Remove-SMS-integration.patch

Remove-price-shopping-commerce-integrations.patch

Remove-voice-recognition-integration.patch

Do-not-compile-QR-code-sharing.patch

Timezone-customization.patch

Revert-the-removal-of-an-option-to-block-autoplay.patch

Add-support-for-ISupportHelpAndFeedback.patch

JIT-site-settings.patch

Site-setting-for-images.patch

Offer-builtin-autocomplete-for-chrome-flags.patch

Use-4-tile-rows-never-show-logo.patch

Disable-various-metrics.patch

Enable-SPPI-for-devices-with-enough-memory.patch

Enable-StrictOriginIsolation-and-SitePerProcess.patch

Use-64-bit-WebView-processes.patch

prefs-always-prompt-for-download-directory.patch

Disable-the-DIAL-repeating-discovery.patch

Block-qjz9zk-or-trk-requests.patch

Hardening-against-incognito-mode-detection.patch

Remove-weblayer-dependency-on-Play-Services.patch

Restore-Simplified-NTP-launch.patch

Add-option-to-use-home-page-as-NTP.patch

Disable-text-fragments-by-default.patch

User-agent-customization.patch

Add-AllowUserCertificates-flag.patch

Add-IsCleartextPermitted-flag.patch

Unexpire-tab-groups-flags.patch

Add-flag-for-omnibox-autocomplete-filtering.patch

Revert-Delete-block-external-form-redirects.patch

Add-flag-to-disable-external-intent-requests.patch

Add-flag-to-disable-vibration.patch

mime_util-force-text-x-suse-ymp-to-be-downloaded.patch

Client-hints-overrides.patch

Disable-AGSA-by-default.patch

Allow-building-without-enable_reporting.patch

Disable-lock-icon-in-address-bar-by-default.patch

Experimental-user-scripts-support.patch

Disable-safety-check.patch

Disable-all-predictors-code.patch

OpenSearch-miscellaneous.patch

Update-i18n-zh_CN-support.patch

Add-flag-for-save-data-header.patch

Disable-UA-full-version.patch

Dictionary-suggestions-for-the-Omnibox.patch

Disable-AsyncDNS-by-default.patch

Restore-LastTabStandingTracker.patch

Add-lifetime-options-for-permissions.patch

Disable-crash-reporting.patch

Samsung-Note-9-SDK27-crazylinker-workaround.patch

Disable-TLS-resumption.patch

Remove-mremap-from-seccomp-baseline-policy.patch

Move-navigation-bar-to-bottom.patch

Welcome-screen.patch

Add-site-engagement-flag.patch

Remove-navigator.connection-info.patch

Disable-PrivacyGuide.patch

sharing-hub-always-use-visible-URL.patch

Re-introduce-kWebAuthCable.patch

Enable-HEVC-by-default.patch

Partition-blobs-by-top-frame-URL.patch

Override-Navigator-Language.patch

Remove-HTTP-referrals-in-cross-origin-navigation.patch

Enable-ECH-by-default.patch

Disable-StartSurface-feature.patch

Clamp-time-resolution-in-requestAnimationFrame.patch

Enable-PermuteTLSExtensions-by-default.patch

Enable-third-party-storage-partitioning.patch

Restore-adaptive-button-in-top-toolbar-customization.patch

Automated-domain-substitution.patch

bromite-build-utils.patch

From 5d0142f62b1968bee7a6ffd114d07380e4ca15ca Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Tue, 5 May 2020 07:22:20 +0200

Subject: AImageReader CFI crash mitigations

Subject: [PATCH 106/192] AImageReader CFI crash mitigations

Revert "gpu/android: Remove setup for disabling AImageReader."

This reverts commit dcd5a39518246eb999f1cc63bf1ec95d93fd5b2f.

 12 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc

index d26f7e8a19517..a20f33f114b91 100644

--- a/base/android/android_image_reader_compat.cc

+++ b/base/android/android_image_reader_compat.cc

@@ -23,6 +23,8 @@

 AndroidImageReader::AndroidImageReader() : is_supported_(LoadFunctions()) {}

diff --git a/base/android/android_image_reader_compat.h b/base/android/android_image_reader_compat.h

index bef2ae103235c..b44886946d565 100644

--- a/base/android/android_image_reader_compat.h

+++ b/base/android/android_image_reader_compat.h

@@ -24,6 +24,9 @@ class BASE_EXPORT AndroidImageReader {

   AndroidImageReader();

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

index d936cee457710..949773a2c7ff2 100644

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -2501,9 +2501,9 @@

     "expiry_milestone": 115

@@ -2798,9 +2798,9 @@

     "expiry_milestone": 125

   },

   {

-    "name": "enable-image-reader",

-    "owners": [ "vikassoni", "liberato" ],

-    "expiry_milestone": 115

-    "expiry_milestone": 125

+    "name": "enable-image-reader",          // Bromite: do not expire

+    "owners": [ "vikassoni", "liberato" ],  // flag

+    "expiry_milestone": -1

   {

     "name": "enable-immersive-fullscreen-toolbar",

diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json

index 4e7fd14c5231f..827576124460a 100644

--- a/gpu/config/gpu_driver_bug_list.json

+++ b/gpu/config/gpu_driver_bug_list.json

@@ -3199,6 +3199,22 @@

         "dont_delete_source_texture_for_egl_image"

@@ -3698,6 +3698,22 @@

         "no_downscaled_overlay_promotion"

       ]

     },

+    {

+      ]

+    },

     {

       "id": 336,

       "cr_bugs": [625785],

       "id": 381,

       "cr_bugs": [

diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc

index eb8057834e27f..a949cb3623385 100644

--- a/gpu/config/gpu_finch_features.cc

+++ b/gpu/config/gpu_finch_features.cc

@@ -64,6 +64,11 @@ BASE_FEATURE(kUseGles2ForOopR,

@@ -65,6 +65,11 @@ BASE_FEATURE(kUseGles2ForOopR,

 #endif

 );

 // Use android SurfaceControl API for managing display compositor's buffer queue

 // and using overlays on Android. Also used by webview to disable surface

diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h

index 785791599ecce..824d0dbb18dfe 100644

--- a/gpu/config/gpu_finch_features.h

+++ b/gpu/config/gpu_finch_features.h

@@ -17,6 +17,7 @@ namespace features {

 #if BUILDFLAG(IS_ANDROID)

 GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc

index 82528e1b97ab6..572ea0893e45e 100644

--- a/gpu/config/gpu_util.cc

+++ b/gpu/config/gpu_util.cc

@@ -121,6 +121,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(

@@ -122,6 +122,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(

 #if !BUILDFLAG(IS_ANDROID)

   return kGpuFeatureStatusDisabled;

 #else

   if (!gpu_preferences.enable_android_surface_control)

     return kGpuFeatureStatusDisabled;

@@ -344,6 +347,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {

@@ -351,6 +354,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {

     gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =

         kGpuFeatureStatusBlocklisted;

   }

 // Estimates roughly user total disk space by counting in the drives where

diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt

index 5530042f3a807..e897fc62cb449 100644

--- a/gpu/config/gpu_workaround_list.txt

+++ b/gpu/config/gpu_workaround_list.txt

@@ -15,6 +15,7 @@ decode_encode_srgb_for_generatemipmap

 disable_accelerated_av1_decode

+disable_aimagereader

 disable_accelerated_av1_encode

 disable_accelerated_h264_decode

 disable_accelerated_h264_encode

 disable_accelerated_hevc_decode

diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc

index e122255a4e94c..cd535f6040c17 100644

--- a/gpu/ipc/service/gpu_init.cc

+++ b/gpu/ipc/service/gpu_init.cc

@@ -626,6 +626,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

@@ -616,6 +616,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

   }

 #endif  // BUILDFLAG(IS_WIN)

           kGpuFeatureStatusEnabled ||

       !InitializeVulkan()) {

diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc

index 5dcfbd4be3fdc..1adbf4683ad8c 100644

--- a/gpu/ipc/service/stream_texture_android.cc

+++ b/gpu/ipc/service/stream_texture_android.cc

@@ -6,6 +6,7 @@

+#include "base/android/android_image_reader_compat.h"

 #include "base/android/scoped_hardware_buffer_fence_sync.h"

 #include "base/bind.h"

 #include "base/feature_list.h"

@@ -51,7 +52,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(

 #include "base/functional/bind.h"

@@ -50,7 +51,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(

 }

 TextureOwner::Mode GetTextureOwnerMode() {

              : TextureOwner::Mode::kSurfaceTextureInsecure;

 }

diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc

index 3352c21226ff9..a2a99a11eb82f 100644

--- a/media/base/media_switches.cc

+++ b/media/base/media_switches.cc

@@ -750,6 +750,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,

@@ -946,6 +946,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,

 // Allows automatically disabling hardware secure Content Decryption Module

 // (CDM) after failures or crashes to fallback to software secure CDMs. If this

 // feature is disabled, the fallback will never happen and users could be stuck

 BASE_FEATURE(kHardwareSecureDecryptionFallback,

              "HardwareSecureDecryptionFallback",

diff --git a/media/base/media_switches.h b/media/base/media_switches.h

index 81f2f07bef7f5..d9259debfdffa 100644

--- a/media/base/media_switches.h

+++ b/media/base/media_switches.h

@@ -232,6 +232,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding);

 #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);

@@ -327,6 +327,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoToolboxVideoDecoder);

 #endif  // BUILDFLAG(IS_APPLE)

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebRTCColorAccuracy);

+MEDIA_EXPORT BASE_DECLARE_FEATURE(kAImageReaderVideoOutput);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kVp9kSVCHWDecoding);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kWakeLockOptimisationHiddenMuted);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebContentsCaptureHiDpi);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebrtcMediaCapabilitiesParameters);

-- 

2.25.1

2.34.1

From 24643d42b1e735d4b77c238d385ee956e777f197 Mon Sep 17 00:00:00 2001

From: uazo <uazo@users.noreply.github.com>

Date: Mon, 26 Apr 2021 13:28:24 +0000

Subject: Add AllowUserCertificates flag

Subject: [PATCH 130/192] Add AllowUserCertificates flag

Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html

License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 .../src/org/chromium/chrome/browser/app/ChromeActivity.java  | 3 +++

 .../chromium/chrome/browser/app/flags/ChromeCachedFlags.java | 1 +

 chrome/browser/about_flags.cc                                | 4 ++++

 chrome/browser/flag_descriptions.cc                          | 5 +++++

 chrome/browser/flag_descriptions.h                           | 3 +++

 chrome/browser/flags/android/chrome_feature_list.cc          | 5 +++++

 chrome/browser/flags/android/chrome_feature_list.h           | 1 +

 .../chromium/chrome/browser/flags/CachedFeatureFlags.java    | 1 +

 .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 3 +++

 .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 4 ++++

 net/android/java/src/org/chromium/net/X509Util.java          | 5 +++++

 10 files changed, 31 insertions(+)

 8 files changed, 30 insertions(+)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

index b055fe5329377..29470425403e0 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -226,6 +226,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;

@@ -231,6 +231,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;

 import org.chromium.content_public.browser.SelectionPopupController;

 import org.chromium.content_public.browser.WebContents;

 import org.chromium.content_public.common.ContentSwitches;

 import org.chromium.printing.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

@@ -951,6 +952,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

         UpdateMenuItemHelper.getInstance().onStart();

@@ -973,6 +974,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

         super.onStartWithNative();

         ChromeActivitySessionTracker.getInstance().onStartWithNative();

         ChromeCachedFlags.getInstance().cacheNativeFlags();

+        X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled(

+                                            ChromeFeatureList.ALLOW_USER_CERTIFICATES);

         OfflineIndicatorController.initialize();

         // postDeferredStartupIfNeeded() is called in TabModelSelectorTabObsever#onLoadStopped(),

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java

@@ -78,6 +78,7 @@ public class ChromeCachedFlags {

                 add(ChromeFeatureList.sAndroidAuxiliarySearch);

                 add(ChromeFeatureList.sAnonymousUpdateChecks);

                 add(ChromeFeatureList.sAppMenuMobileSiteOption);

+                add(ChromeFeatureList.sAllowUserCertificates);

                 add(ChromeFeatureList.sBackGestureRefactorAndroid);

                 add(ChromeFeatureList.sCctBrandTransparency);

                 add(ChromeFeatureList.sCctIncognito);

         // #onPageLoadFinished() and #onCrash(). If we are not actively loading a tab (e.g.

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

index c0a1b31295fdb..4a0b8ff904c15 100644

--- a/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

@@ -8830,6 +8830,10 @@ const FeatureEntry kFeatureEntries[] = {

      FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)},

 #endif  // BUILDFLAG(IS_WIN)

@@ -9188,6 +9188,10 @@ const FeatureEntry kFeatureEntries[] = {

      flag_descriptions::kHttpsUpgradesDescription, kOsDesktop | kOsAndroid,

      FEATURE_VALUE_TYPE(features::kHttpsUpgrades)},

+    {"allow-user-certificates",

+     flag_descriptions::kAllowUserCertificatesName,

      flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsName,

      flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsDescription,

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc

index 425a6ddaa75ed..9961b08c2e5a8 100644

--- a/chrome/browser/flag_descriptions.cc

+++ b/chrome/browser/flag_descriptions.cc

@@ -13,6 +13,11 @@

@@ -16,6 +16,11 @@

 namespace flag_descriptions {

 const char kAccelerated2dCanvasDescription[] =

     "Enables the use of the GPU to perform 2d canvas rendering instead of "

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h

index 9625553e578fb..992e8dcc0d6c4 100644

--- a/chrome/browser/flag_descriptions.h

+++ b/chrome/browser/flag_descriptions.h

@@ -40,6 +40,9 @@ namespace flag_descriptions {

@@ -42,6 +42,9 @@ namespace flag_descriptions {

 // Cross-platform -------------------------------------------------------------

 extern const char kAccelerated2dCanvasDescription[];

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

index 68ec6f5c77d55..b7c3b47e7fab2 100644

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -148,6 +148,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &feed::kFeedNoViewCache,

     &feed::kFeedReplaceAll,

@@ -142,6 +142,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &feed::kFeedBoCSigninInterstitial,

     &feed::kFeedUserInteractionReliabilityReport,

     &feed::kInterestFeedContentSuggestions,

+    &kAllowUserCertificates,

     &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,

     &feed::kInterestFeedV2,

     &feed::kInterestFeedV2Autoplay,

@@ -468,6 +469,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,

              "AllowNewIncognitoTabIntents",

              base::FEATURE_ENABLED_BY_DEFAULT);

     &feed::kInterestFeedV2Hearts,

@@ -458,6 +459,10 @@ BASE_FEATURE(kSearchReadyOmniboxFeature,

              "SearchReadyOmnibox",

              base::FEATURE_DISABLED_BY_DEFAULT);

+BASE_FEATURE(kAllowUserCertificates,

+             "AllowUserCertificates",

              "FocusOmniboxInIncognitoTabIntents",

              base::FEATURE_ENABLED_BY_DEFAULT);

diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h

index b4d994655a6bd..d37e3e41ba30a 100644

--- a/chrome/browser/flags/android/chrome_feature_list.h

+++ b/chrome/browser/flags/android/chrome_feature_list.h

@@ -17,6 +17,7 @@ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbar);

 BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2);

@@ -20,6 +20,7 @@ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2);

 BASE_DECLARE_FEATURE(kAddToHomescreenIPH);

 BASE_DECLARE_FEATURE(kAllowNewIncognitoTabIntents);

 BASE_DECLARE_FEATURE(kAndroidAppIntegration);

+BASE_DECLARE_FEATURE(kAllowUserCertificates);

 BASE_DECLARE_FEATURE(kAndroidScrollOptimizations);

 BASE_DECLARE_FEATURE(kAndroidAppIntegrationSafeSearch);

 BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification);

 BASE_DECLARE_FEATURE(kAssistantConsentModal);

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

@@ -50,6 +50,7 @@ public class CachedFeatureFlags {

             ImmutableMap.<String, Boolean>builder()

                     .put(ChromeFeatureList.ANONYMOUS_UPDATE_CHECKS, true)

                     .put(ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, false)

+                    .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false)

                     .put(ChromeFeatureList.BACK_GESTURE_REFACTOR, false)

                     .put(ChromeFeatureList.CCT_BRAND_TRANSPARENCY, false)

                     .put(ChromeFeatureList.CCT_INCOGNITO, true)

 BASE_DECLARE_FEATURE(kAndroidImprovedBookmarks);

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

index b748aa6f4d7b6..5e9a79513b9a6 100644

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -193,6 +193,7 @@ public abstract class ChromeFeatureList {

@@ -98,6 +98,7 @@ public abstract class ChromeFeatureList {

     }

     /* Alphabetical: */

+    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";

     public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -648,6 +649,8 @@ public abstract class ChromeFeatureList {

     public static final String FEED_REPLACE_ALL = "FeedReplaceAll";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =

             "AdaptiveButtonInTopToolbarTranslate";

@@ -499,6 +500,8 @@ public abstract class ChromeFeatureList {

     public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting";

     /* Alphabetical: */

+    public static final CachedFlag sAllowUserCertificates =

+            new CachedFlag(ALLOW_USER_CERTIFICATES, false);

     public static final CachedFlag sAndroidAuxiliarySearch =

             new CachedFlag(OMNIBOX_ANDROID_AUXILIARY_SEARCH, false);

     public static final CachedFlag sAnonymousUpdateChecks =

     public static final CachedFlag sAppMenuMobileSiteOption =

             new CachedFlag(APP_MENU_MOBILE_SITE_OPTION, false);

     public static final CachedFlag sBackGestureActivityTabProvider =

@@ -622,6 +625,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowser = List.of(

             // clang-format off

+        sAllowUserCertificates,

         sAppMenuMobileSiteOption,

         sBackGestureActivityTabProvider,

         sBackGestureRefactorActivityAndroid,

diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java

index 2d1340a43c36e..7b6ce578c3eef 100644

--- a/net/android/java/src/org/chromium/net/X509Util.java

+++ b/net/android/java/src/org/chromium/net/X509Util.java

@@ -437,6 +437,8 @@ public class X509Util {

         return false;

@@ -545,6 +545,8 @@ public class X509Util {

         return userRootBytes.toArray(new byte[0][]);

     }

+    public static boolean AllowUserCertificates = false;

     public static AndroidCertVerifyResult verifyServerCertificates(byte[][] certChain,

                                                                    String authType,

                                                                    String host)

@@ -517,6 +519,9 @@ public class X509Util {

@@ -631,6 +633,9 @@ public class X509Util {

                 isIssuedByKnownRoot = isKnownRoot(root);

             }

                                                isIssuedByKnownRoot, verifiedChain);

         }

-- 

2.25.1

2.34.1

From 5580c3b75933c9ac62c21f19fe63b579b587be5e Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Tue, 9 Mar 2021 19:43:00 +0100

Subject: Add Alt+D hotkey to focus address bar

Subject: [PATCH 128/192] Add Alt+D hotkey to focus address bar

License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 1 file changed, 2 insertions(+)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

index 73aec26a909ab..c970a8f286c5f 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

@@ -155,6 +155,8 @@ public class KeyboardShortcuts {

@@ -151,6 +151,8 @@ public class KeyboardShortcuts {

                 KeyEvent.KEYCODE_F, KeyEvent.META_CTRL_ON);

         addShortcut(context, chromeFeatureShortcutGroup, R.string.keyboard_shortcut_address_bar,

                 KeyEvent.KEYCODE_L, KeyEvent.META_CTRL_ON);

         KeyboardShortcutGroup webpageShortcutGroup = new KeyboardShortcutGroup(

-- 

2.25.1

2.34.1