Patches for v145

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

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

@@ -260,6 +260,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;

@@ -1096,6 +1097,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -1116,6 +1117,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

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

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

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

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

     &feed::kFeedNoViewCache,

     &feed::kFeedPerformanceStudy,

     &feed::kFeedRecyclerBinderUnmountOnDetach,

     &feed::kFeedShowSignInCommand,

+    &kAllowUserCertificates,

     &feed::kFeedSignedOutViewDemotion,

     &feed::kInterestFeedV2,

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

--- 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

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

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

             "AccountForSuppressedKeyboardInsets";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

             "AdaptiveButtonInTopToolbarCustomizationV2";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ANDROID_ANIMATED_PROGRESS_BAR_IN_BROWSER =

@@ -820,6 +821,8 @@ public abstract class ChromeFeatureList {

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

     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =

             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);

     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 =

@@ -1136,6 +1139,7 @@ public abstract class ChromeFeatureList {

@@ -1121,6 +1124,7 @@ public abstract class ChromeFeatureList {

                     // keep-sorted start

                     sAccountForSuppressedKeyboardInsets,

                     sAndroidAnimatedProgressBarInBrowser,

                     sAndroidAnimatedProgressBarInViz,

+                    sAllowUserCertificates,

                     sAndroidAppIntegrationModule,

                     sAndroidAppIntegrationMultiDataSource,

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

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

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

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

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

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

         return result;

     }

+    public static boolean AllowUserCertificates = false;

     public static AndroidCertVerifyResult verifyServerCertificates(

             byte[][] certChain,

             String authType,

@@ -639,6 +641,9 @@ public class X509Util {

@@ -649,6 +651,9 @@ public class X509Util {

                 X509Certificate root = verifiedChain.get(verifiedChain.size() - 1);

                 isIssuedByKnownRoot = isKnownRoot(root);

             }

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

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

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

                     KeyEvent.KEYCODE_ESCAPE,

                     KeyEvent.META_CTRL_ON);

         }

diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc

--- a/net/url_request/url_request_http_job.cc

+++ b/net/url_request/url_request_http_job.cc

@@ -400,6 +400,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

@@ -401,6 +401,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

       }

     }

diff --git a/base/features.cc b/base/features.cc

--- a/base/features.cc

+++ b/base/features.cc

@@ -200,6 +200,10 @@ bool IsReducePPMsEnabled() {

@@ -202,6 +202,10 @@ bool IsReducePPMsEnabled() {

   return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);

 }

Adds restrict-gamepad-access flag (default active) to disable GamePad API.

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

---

 chrome/browser/flag-metadata.json                         | 4 ++--

 content/child/runtime_features.cc                         | 2 ++

 .../about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc  | 7 +++++++

 device/gamepad/public/cpp/gamepad_features.cc             | 8 ++++++++

 device/gamepad/public/cpp/gamepad_features.h              | 2 ++

 .../blink/renderer/modules/gamepad/navigator_gamepad.cc   | 6 ++++++

 6 files changed, 27 insertions(+), 2 deletions(-)

 5 files changed, 25 insertions(+)

 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc

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

@@ -9195,9 +9195,9 @@

     "expiry_milestone": 150

   },

   {

-    "name": "restrict-gamepad-access",

+    "name": "restrict-gamepad-access", // restrict-gamepad-access"

     "owners": [ "//device/gamepad/OWNERS", "jameshollyer@chromium.org" ],

-    "expiry_milestone": 96

+    "expiry_milestone": -1

   },

   {

     "name": "rewriter-api-for-gemini-nano",

diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc

--- a/content/child/runtime_features.cc

+++ b/content/child/runtime_features.cc

@@ -262,6 +262,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {

@@ -264,6 +264,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {

           {wf::EnablePaymentApp, raw_ref(features::kServiceWorkerPaymentApps)},

           {wf::EnablePeriodicBackgroundSync,

            raw_ref(features::kPeriodicBackgroundSync)},

 #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-blink.h"

 #include "third_party/blink/public/platform/task_type.h"

 #include "third_party/blink/renderer/bindings/modules/v8/v8_gamepad_mapping_type.h"

@@ -86,6 +87,9 @@ NavigatorGamepad& NavigatorGamepad::From(Navigator& navigator) {

@@ -88,6 +89,9 @@ NavigatorGamepad& NavigatorGamepad::From(Navigator& navigator) {

 HeapVector<Member<Gamepad>> NavigatorGamepad::getGamepads(

     Navigator& navigator,

     ExceptionState& exception_state) {

   if (!navigator.DomWindow()) {

     // Using an existing NavigatorGamepad if one exists, but don't create one

     // for a detached window, as its subclasses depend on a non-null window.

@@ -428,6 +432,8 @@ void NavigatorGamepad::MaybeDispatchGamepadEvents(

@@ -432,6 +436,8 @@ void NavigatorGamepad::MaybeDispatchGamepadEvents(

 void NavigatorGamepad::DispatchGamepadConnectionChangedEvent(

     const AtomicString& event_name,

     Gamepad* gamepad) {