Merge branch '3718-master-upstream' into 'master'

use_official_google_api_keys=false

use_rtti=false

use_stable_package_name_for_trichrome=false

use_sysroot=false

use_thin_lto=false

use_v8_context_snapshot=false

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

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

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

@@ -236,6 +236,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

@@ -239,6 +239,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

 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;

@@ -985,6 +986,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -999,6 +1000,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());

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

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

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

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

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

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =

@@ -768,6 +769,8 @@ public abstract class ChromeFeatureList {

@@ -796,6 +797,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =

             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);

     public static final CachedFlag sAppSpecificHistoryViewIntent =

             newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);

     public static final CachedFlag sAsyncNotificationManager =

@@ -1080,6 +1083,7 @@ public abstract class ChromeFeatureList {

                     sAccountForSuppressedKeyboardInsets,

                     sAllowTabClosingUponMinimization,

@@ -1131,6 +1134,7 @@ public abstract class ChromeFeatureList {

                     sAndroidAnimatedProgressBarInBrowser,

                     sAndroidAnimatedProgressBarInViz,

                     sAndroidAppIntegration,

+                    sAllowUserCertificates,

                     sAndroidAppIntegrationModule,

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

---

 .../src/org/chromium/chrome/browser/KeyboardShortcuts.java   | 5 +++++

 1 file changed, 5 insertions(+)

 .../src/org/chromium/chrome/browser/KeyboardShortcuts.java  | 6 ++++++

 1 file changed, 6 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

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

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

@@ -890,6 +890,11 @@ public class KeyboardShortcuts {

                     KeyEvent.KEYCODE_B,

                     (KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON));

@@ -895,6 +895,12 @@ public class KeyboardShortcuts {

                     KeyEvent.KEYCODE_ESCAPE,

                     KeyEvent.META_CTRL_ON);

         }

+        addShortcut(context,

+            shortcutGroupsById.get(R.string.keyboard_shortcut_chrome_feature_group_header),

+                    shortcutGroupsById,

+                    R.string.keyboard_shortcut_chrome_feature_group_header,

+                    R.string.keyboard_shortcut_address_bar,

+                    KeyEvent.KEYCODE_D,

+                    KeyEvent.META_ALT_ON);

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

@@ -100,6 +100,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

     private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";

     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";

     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";

diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

@@ -376,6 +376,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {

@@ -409,6 +409,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {

   builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);

 #endif

   builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);

 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)

 #include "chrome/browser/background/extensions/background_mode_manager.h"

 #endif

@@ -1605,6 +1607,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

@@ -1685,6 +1687,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

   component_updater::RegisterPrefs(registry);

   domain_reliability::RegisterPrefs(registry);

   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn

--- a/chrome/browser/ui/BUILD.gn

+++ b/chrome/browser/ui/BUILD.gn

@@ -169,6 +169,8 @@ static_library("ui") {

@@ -156,6 +156,8 @@ static_library("ui") {

     "webui/metrics_internals/metrics_internals_ui.h",

     "webui/net_export_ui.cc",

     "webui/net_export_ui.h",

 #if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER)

 #include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h"

 #endif

@@ -422,7 +425,7 @@ void RegisterChromeWebUIConfigs() {

@@ -424,7 +427,7 @@ void RegisterChromeWebUIConfigs() {

   map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());

   map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());

 #endif

diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc

--- a/chrome/common/webui_url_constants.cc

+++ b/chrome/common/webui_url_constants.cc

@@ -50,6 +50,7 @@ bool IsSystemWebUIHost(std::string_view host) {

@@ -53,6 +53,7 @@ bool IsSystemWebUIHost(std::string_view host) {

       kChromeUILockScreenNetworkHost,

       kChromeUILockScreenStartReauthHost,

       kChromeUIMobileSetupHost,

       kChromeUIMultiDeviceSetupHost,

       kChromeUINetworkHost,

       kChromeUINotificationTesterHost,

@@ -71,6 +72,7 @@ bool IsSystemWebUIHost(std::string_view host) {

@@ -74,6 +75,7 @@ bool IsSystemWebUIHost(std::string_view host) {

 // These hosts will also be suggested by BuiltinProvider.

 base::span<const base::cstring_view> ChromeURLHosts() {

   static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({