Patches for v148

                 BackPressHelper.create(

                         this, getOnBackPressedDispatcher(), mBookmarkManagerCoordinator);

+

+        mBookmarkManagerCoordinator.setWindow(mWindowAndroid,

+        mBookmarkManagerCoordinator.setWindow(getWindowAndroid(),

+            getModalDialogManagerSupplier().get());

     }

+    protected void onSaveInstanceState(Bundle outState) {

+        super.onSaveInstanceState(outState);

+

+        mWindowAndroid.getIntentRequestTracker().saveInstanceState(outState);

+        getWindowAndroid().getIntentRequestTracker().saveInstanceState(outState);

+    }

+

+    @Override

+    public void onRequestPermissionsResult(

+            int requestCode, String[] permissions, int[] grantResults) {

+        if (mWindowAndroid.handlePermissionResult(requestCode, permissions, grantResults))

+        if (getWindowAndroid().handlePermissionResult(requestCode, permissions, grantResults))

+            return;

+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);

+    }

+#include "chrome/browser/bookmarks/bookmark_html_writer.h"

+#include "chrome/browser/importer/profile_writer.h"

+#include "chrome/browser/platform_util.h"

+#include "chrome/browser/ui/chrome_select_file_policy.h"

+#include "chrome/browser/ui/select_file_policy/chrome_select_file_policy.h"

+#include "components/user_data_importer/common/imported_bookmark_entry.h"

+#include "components/user_data_importer/content/content_bookmark_parser.h"

+#include "components/user_data_importer/content/content_bookmark_parser_utils.h"

 .../common/network_switch_list.h                |  4 ++++

 .../spoof_checks/top_domains/BUILD.gn           |  1 +

 ...o-configure-maximum-connections-per-host.inc | 17 +++++++++++++++++

 net/socket/client_socket_pool_manager.cc        | 17 +++++++++++++++++

 4 files changed, 39 insertions(+)

 net/socket/client_socket_pool_manager.cc        | 16 ++++++++++++++++

 4 files changed, 38 insertions(+)

 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-flag-to-configure-maximum-connections-per-host.inc

diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h

 #include "net/ssl/ssl_config.h"

 #include "url/gurl.h"

 #include "url/scheme_host_port.h"

@@ -169,6 +173,19 @@ void ClientSocketPoolManager::set_socket_soft_cap_per_pool_for_test(

@@ -169,6 +173,18 @@ void ClientSocketPoolManager::set_socket_soft_cap_per_pool_for_test(

 // static

 size_t ClientSocketPoolManager::max_sockets_per_group(

     HttpNetworkSession::SocketPoolType pool_type) {

+

+  if (pool_type == HttpNetworkSession::NORMAL_SOCKET_POOL) {

+  if (pool_type == net::HttpNetworkSession::SocketPoolType::kNormal) {

+      int maxConnectionsPerHost = 0;

+      auto value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kMaxConnectionsPerHost);

+      if (!value.empty() && !base::StringToInt(value, &maxConnectionsPerHost)) {

 .../webauthn/android/webauthn_feature_map.cc  |  1 +

 components/webauthn/features.cc               |  4 +++

 components/webauthn/features.h                |  3 +++

 device/fido/public/features.cc                |  2 ++

 device/fido/public/features.cc                |  1 +

 .../authentication_credentials_container.cc   |  5 ++++

 11 files changed, 74 insertions(+), 33 deletions(-)

 11 files changed, 73 insertions(+), 33 deletions(-)

 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java

diff --git a/device/fido/public/features.cc b/device/fido/public/features.cc

--- a/device/fido/public/features.cc

+++ b/device/fido/public/features.cc

@@ -130,6 +130,7 @@ BASE_FEATURE(kWebAuthnPublishPrelinkingInfo,

              "WebAuthenticationPublishPrelinkingInfo",

              base::FEATURE_DISABLED_BY_DEFAULT);

 #endif  // BUILDFLAG(IS_ANDROID)

@@ -183,6 +183,7 @@ BASE_FEATURE_PARAM(int,

 BASE_FEATURE(kWebAuthnImmediateGet,

              "WebAuthenticationImmediateGet",

              base::FEATURE_ENABLED_BY_DEFAULT);

+SET_CROMITE_FEATURE_DISABLED(kWebAuthnImmediateGet);

 // Disabled by default.

 BASE_FEATURE(kWebAuthnHelloSignal,

@@ -189,6 +190,7 @@ BASE_FEATURE_PARAM(int,

                    &kWebAuthnImmediateGet,

                    "timeout_ms",

                    kDefaultImmediateMediationTimeoutMs);

+SET_CROMITE_FEATURE_DISABLED(kWebAuthnImmediateGetAutoselect);

 // Deprecation flag. Disabled by default in M142. Remove in or after M145.

 BASE_FEATURE(kWebAuthnSendPinGeneration,

 BASE_FEATURE_PARAM(int,

                    kWebAuthnImmediateMediationTimeoutMilliseconds,

diff --git a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc

--- a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc

+++ b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc

diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/android/java/res/xml/developer_preferences.xml

--- a/chrome/android/java/res/xml/developer_preferences.xml

+++ b/chrome/android/java/res/xml/developer_preferences.xml

@@ -40,4 +40,8 @@ found in the LICENSE file.

@@ -45,4 +45,8 @@ found in the LICENSE file.

         android:summary="@string/android_fonts_fingerprinting_mitigation_summary"

         app:featureName="android-fonts-fingerprinting-mitigation"

         app:needRestart="true" />

   web_contents_->GetNativeView()->OnPhysicalBackingSizeChanged(size);

-  web_contents_->GetNativeView()->OnSizeChanged(size.width(), size.height());

+  web_contents_->GetNativeView()->OnSizeChanged(size.width(), size.height(), size.height());

+  web_contents_->GetNativeView()->OnSizeChanged(size.width(), size.height(), size.width(), size.height());

 }

 }  // namespace android

 .../skia/src/ports/SkFontMgr_android.cpp      |  286 ++-

 .../skia/src/ports/SkFontMgr_android_data.cpp | 1641 +++++++++++++++++

 .../skia/src/ports/SkFontMgr_android_ndk.cpp  |    2 +-

 .../src/ports/SkFontMgr_android_parser.cpp    |   66 +-

 .../src/ports/SkFontMgr_android_parser.cpp    |   69 +-

 .../skia/src/ports/SkFontMgr_android_parser.h |    5 +-

 42 files changed, 2449 insertions(+), 88 deletions(-)

 42 files changed, 2451 insertions(+), 89 deletions(-)

 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Android-fonts-fingerprinting-mitigation.grdp

 create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.cc

 create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.h

diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/android/java/res/xml/developer_preferences.xml

--- a/chrome/android/java/res/xml/developer_preferences.xml

+++ b/chrome/android/java/res/xml/developer_preferences.xml

@@ -23,4 +23,9 @@ found in the LICENSE file.

         android:title="Hint: You can also enable Developer options on Beta/Stable channels by tapping the Chrome version in "Settings > About Chrome" multiple times."

         app:allowDividerAbove="false"

         app:allowDividerBelow="false" />

@@ -28,4 +28,9 @@ found in the LICENSE file.

         android:summary="@string/android_gpu_sandbox_summary"

         app:featureName="android-gpu-sandbox"

         app:needRestart="true" />

+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference

+        android:title="@string/android_fonts_fingerprinting_mitigation_title"

+        android:summary="@string/android_fonts_fingerprinting_mitigation_summary"

     static constexpr char kFontFilePrefix[] = "/fonts/";

     // Version 21 of the system font configuration does not need any fallback configuration files.

@@ -888,8 +923,8 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(

@@ -881,15 +916,16 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(

         // Product fonts (fonts_customization.xml) leverage <fonts-modification version="21">

         // Therefore, we only attempt to parse them on modern devices (Android Lollipop+).

         // Pre-21 systems fall through to the legacy fallback fonts handling below.

+        if (!custom)

         SkFontMgr_Android_Parser::GetCustomFontFamilies(

-                fontFamilies, basePath, PRODUCT_CUSTOMIZATION_FILE, nullptr, nullptr);

+                fontFamilies, basePath, custom, PRODUCT_CUSTOMIZATION_FILE, nullptr, nullptr);

         return;

     }

     // Append all the fallback fonts to system fonts

     std::vector<std::unique_ptr<FontFamily>> fallbackFonts;

     fontFamilies.insert(fontFamilies.end(),

                         std::make_move_iterator(fallbackFonts.begin()),

                         std::make_move_iterator(fallbackFonts.end()));

@@ -898,15 +933,16 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(

@@ -898,15 +934,16 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(

 void SkFontMgr_Android_Parser::GetCustomFontFamilies(

         std::vector<std::unique_ptr<FontFamily>>& fontFamilies,

         const SkString& basePath,