v120 patches

build/bromite_patches_list.txt

@@ -1,11 +1,3 @@
-eyeo-beta-118.0.5993.48-base.patch
-eyeo-beta-118.0.5993.48-chrome_integration.patch
-eyeo-beta-118.0.5993.48-android_api.patch
-eyeo-beta-118.0.5993.48-android_settings.patch
-eyeo-beta-118.0.5993.48-extension_api.patch
-00Eyeo-Adblock-Remove-Privacy-Issues.patch
-00AdblockPlus-add-blocking-in-service-workers.patch
-
 bromite-build-utils.patch
 Remove-EV-certificates.patch
 do-not-hide-.orig-files.patch
@@ -285,8 +277,15 @@ Timezone-customization.patch
 00Add-cromite-flags-support.patch
 
 00Temp-PerformanceNavigationTiming-privacy-fix.patch
-
 00Temp-disable-predictive-back-gesture.patch
 00TEMP-Add-a-log-to-track-strange-behavior.patch
 00Temp-guard-FileSystemAccessPersistentPermissions.patch
-00Fix-chromium-build-bugs.patch
+00Fix-chromium-build-bugs.patch
+
+eyeo-beta-118.0.5993.48-base.patch
+eyeo-beta-118.0.5993.48-chrome_integration.patch
+eyeo-beta-118.0.5993.48-android_api.patch
+eyeo-beta-118.0.5993.48-android_settings.patch
+eyeo-beta-118.0.5993.48-extension_api.patch
+00Eyeo-Adblock-Remove-Privacy-Issues.patch
+00AdblockPlus-add-blocking-in-service-workers.patch

build/patches/00AdblockPlus-add-blocking-in-service-workers.patch

@@ -401,7 +401,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.h b/chrome/br
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -6330,7 +6330,9 @@ ChromeContentBrowserClient::
+@@ -6328,7 +6328,9 @@ ChromeContentBrowserClient::
  }
 
  bool ChromeContentBrowserClient::WillInterceptWebSocket(
@@ -412,7 +412,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #if BUILDFLAG(ENABLE_EXTENSIONS)
    if (!frame) {
      return false;
-@@ -6351,9 +6353,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(
+@@ -6349,9 +6351,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(
  }
 
  void ChromeContentBrowserClient::CreateWebSocket(
@@ -427,7 +427,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
 --- a/chrome/browser/chrome_content_browser_client.h
 +++ b/chrome/browser/chrome_content_browser_client.h
-@@ -624,11 +624,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -630,11 +630,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
    CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
        int frame_tree_node_id,
        const network::ResourceRequest& resource_request) override;
@@ -662,7 +662,7 @@ diff --git a/components/adblock/content/browser/resource_classification_runner_i
 diff --git a/content/browser/websockets/websocket_connector_impl.cc b/content/browser/websockets/websocket_connector_impl.cc
 --- a/content/browser/websockets/websocket_connector_impl.cc
 +++ b/content/browser/websockets/websocket_connector_impl.cc
-@@ -87,14 +87,14 @@ void WebSocketConnectorImpl::Connect(
+@@ -88,14 +88,14 @@ void WebSocketConnectorImpl::Connect(
    const uint32_t options =
        GetContentClient()->browser()->GetWebSocketOptions(frame);
 
@@ -672,8 +672,8 @@ diff --git a/content/browser/websockets/websocket_connector_impl.cc b/content/br
 -        frame,
 +        process, frame,
          base::BindOnce(ConnectCalledByContentBrowserClient, requested_protocols,
-                        site_for_cookies, isolation_info_, process_id_,
-                        frame_id_, origin_, options,
+                        site_for_cookies, has_storage_access, isolation_info_,
+                        process_id_, frame_id_, origin_, options,
                         std::move(throttling_profile_id)),
 -        url, site_for_cookies, user_agent, std::move(handshake_client));
 +        url, origin_, site_for_cookies, user_agent, std::move(handshake_client));
@@ -683,7 +683,7 @@ diff --git a/content/browser/websockets/websocket_connector_impl.cc b/content/br
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -998,7 +998,7 @@ bool ContentBrowserClient::WillCreateURLLoaderFactory(
+@@ -1016,7 +1016,7 @@ bool ContentBrowserClient::WillCreateURLLoaderFactory(
    return false;
  }
 
@@ -692,7 +692,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
    return false;
  }
 
-@@ -1007,9 +1007,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) {
+@@ -1025,9 +1025,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) {
  }
 
  void ContentBrowserClient::CreateWebSocket(
@@ -707,7 +707,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -1791,7 +1791,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1842,7 +1842,7 @@ class CONTENT_EXPORT ContentBrowserClient {
        scoped_refptr<base::SequencedTaskRunner> navigation_response_task_runner);
 
    // Returns true when the embedder wants to intercept a websocket connection.
@@ -716,7 +716,7 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/br
 
    // Returns the WebSocket creation options.
    virtual uint32_t GetWebSocketOptions(RenderFrameHost* frame);
-@@ -1813,9 +1813,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1864,9 +1864,11 @@ class CONTENT_EXPORT ContentBrowserClient {
    // Always called on the UI thread and only when the Network Service is
    // enabled.
    virtual void CreateWebSocket(

build/patches/00Add-a-flag-to-disable-GamePad-API.patch

@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -7317,9 +7317,9 @@
+@@ -6879,9 +6879,9 @@
      "expiry_milestone": 121
    },
    {
@@ -29,7 +29,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
-@@ -3017,7 +3017,7 @@ const char kReduceAcceptLanguageDescription[] =
+@@ -2995,7 +2995,7 @@ const char kResetShortcutCustomizationsDescription[] =
 
  const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
  const char kRestrictGamepadAccessDescription[] =