v122 patches

build/RELEASE

@@ -1 +1 @@
-121.0.6167.164
+122.0.6261.43

build/cromite_patches_list.txt

@@ -220,7 +220,6 @@ Disable-SHA1-Server-Signature.patch
 Remove-auth-header-upon-cross-origin-redirect.patch
 Clear-CORS-Preflight-Cache-on-clearing-data.patch
 Multi-Screen-Window-Placement-API-fix.patch
-Remove-https-connection-from-chrome-discards.patch
 Add-a-flag-to-disable-GamePad-API.patch
 Disable-WebGPU.patch
 Disable-FirstPartySets-and-StorageAccessAPI.patch
@@ -296,5 +295,3 @@ eyeo-beta-118.0.5993.48-extension_api.patch
 Eyeo-Adblock-Remove-Privacy-Issues.patch
 AdblockPlus-add-blocking-in-service-workers.patch
 AdblockPlus-connect-popup-blocker.patch
-
-Temp-FIXUP-Content-settings-infrastructure.patch

build/patches/AdblockPlus-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
-@@ -6305,7 +6305,9 @@ ChromeContentBrowserClient::
+@@ -6132,7 +6132,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;
-@@ -6328,9 +6330,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(
+@@ -6155,9 +6157,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(
  }
 
  void ChromeContentBrowserClient::CreateWebSocket(
@@ -422,12 +422,12 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
      const GURL& url,
 +    const url::Origin& initiator_origin,
      const net::SiteForCookies& site_for_cookies,
-     const absl::optional<std::string>& user_agent,
+     const std::optional<std::string>& user_agent,
      mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
 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
-@@ -642,11 +642,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -637,11 +637,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
    CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
        int frame_tree_node_id,
        const network::ResourceRequest& resource_request) override;
@@ -442,7 +442,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chr
        const GURL& url,
 +      const url::Origin& initiator_origin,
        const net::SiteForCookies& site_for_cookies,
-       const absl::optional<std::string>& user_agent,
+       const std::optional<std::string>& user_agent,
        mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
 diff --git a/components/adblock/content/browser/adblock_url_loader_factory.cc b/components/adblock/content/browser/adblock_url_loader_factory.cc
 --- a/components/adblock/content/browser/adblock_url_loader_factory.cc
@@ -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
-@@ -1023,7 +1023,7 @@ bool ContentBrowserClient::WillCreateURLLoaderFactory(
+@@ -1009,7 +1009,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;
  }
 
-@@ -1032,9 +1032,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) {
+@@ -1018,9 +1018,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) {
  }
 
  void ContentBrowserClient::CreateWebSocket(
@@ -702,12 +702,12 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
      const GURL& url,
 +    const url::Origin& initiator_origin,
      const net::SiteForCookies& site_for_cookies,
-     const absl::optional<std::string>& user_agent,
+     const std::optional<std::string>& user_agent,
      mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
 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
-@@ -1859,7 +1859,7 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1840,7 +1840,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);
-@@ -1881,9 +1881,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1862,9 +1862,11 @@ class CONTENT_EXPORT ContentBrowserClient {
    // Always called on the UI thread and only when the Network Service is
    // enabled.
    virtual void CreateWebSocket(
@@ -726,6 +726,6 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/br
        const GURL& url,
 +      const url::Origin& initiator_origin,
        const net::SiteForCookies& site_for_cookies,
-       const absl::optional<std::string>& user_agent,
+       const std::optional<std::string>& user_agent,
        mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
 --

build/patches/Add-AllowUserCertificates-flag.patch

@@ -20,15 +20,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -228,6 +228,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
+@@ -227,6 +227,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.net.X509Util;
  import org.chromium.printing.PrintManagerDelegateImpl;
  import org.chromium.printing.PrintingController;
  import org.chromium.printing.PrintingControllerImpl;
-@@ -1097,6 +1098,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1105,6 +1106,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          super.onStartWithNative();
          ChromeActivitySessionTracker.getInstance().onStartWithNative();
          ChromeCachedFlags.getInstance().cacheNativeFlags();
@@ -40,42 +40,42 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 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
-@@ -144,6 +144,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -136,6 +136,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &feed::kFeedShowSignInCommand,
      &feed::kFeedSignedOutViewDemotion,
      &feed::kFeedUserInteractionReliabilityReport,
 +    &kAllowUserCertificates,
      &feed::kInterestFeedV2,
-     &feed::kInterestFeedV2Autoplay,
      &feed::kInterestFeedV2Hearts,
+     &feed::kWebFeed,
 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
-@@ -103,6 +103,7 @@ public abstract class ChromeFeatureList {
+@@ -141,6 +141,7 @@ public abstract class ChromeFeatureList {
+         return ChromeFeatureMap.getInstance().mutableFlagWithSafeDefault(featureName, defaultValue);
      }
 
-     /* Alphabetical: */
 +    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
-     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =
              "AdaptiveButtonInTopToolbarTranslate";
-@@ -522,6 +523,8 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sAndroidAppIntegration =
-             new CachedFlag(ANDROID_APP_INTEGRATION, false);
-     public static final CachedFlag sAndroidHub = new CachedFlag(ANDROID_HUB, false);
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =
+@@ -521,6 +522,8 @@ public abstract class ChromeFeatureList {
+             newCachedFlag(ANDROID_ELEGANT_TEXT_HEIGHT, false);
+
+     public static final CachedFlag sAndroidHub = newCachedFlag(ANDROID_HUB, false);
 +    public static final CachedFlag sAllowUserCertificates =
-+            new CachedFlag(ALLOW_USER_CERTIFICATES, false);
-     public static final CachedFlag sAppMenuMobileSiteOption =
-             new CachedFlag(APP_MENU_MOBILE_SITE_OPTION, false);
-     public static final CachedFlag sArchiveTabService = new CachedFlag(ARCHIVE_TAB_SERVICE, false);
-@@ -662,6 +665,7 @@ public abstract class ChromeFeatureList {
++            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
+     public static final CachedFlag sArchiveTabService = newCachedFlag(ARCHIVE_TAB_SERVICE, false);
+     public static final CachedFlag sBackGestureActivityTabProvider =
+             newCachedFlag(BACK_GESTURE_ACTIVITY_TAB_PROVIDER, false);
+@@ -655,6 +658,7 @@ public abstract class ChromeFeatureList {
 
      public static final List<CachedFlag> sFlagsCachedFullBrowser =
              List.of(
 +                    sAllowUserCertificates,
                      sAndroidAppIntegration,
+                     sAndroidElegantTextHeight,
                      sAndroidHub,
-                     sAppMenuMobileSiteOption,
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc
 new file mode 100644
 --- /dev/null

build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -198,6 +198,8 @@ public class KeyboardShortcuts {
+@@ -204,6 +204,8 @@ public class KeyboardShortcuts {
                  R.string.keyboard_shortcut_address_bar,
                  KeyEvent.KEYCODE_L,
                  KeyEvent.META_CTRL_ON);

build/patches/Add-IsCleartextPermitted-flag.patch

@@ -44,7 +44,7 @@ new file mode 100644
 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
-@@ -287,6 +287,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -301,6 +301,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
        }
      }
 

build/patches/Add-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
-@@ -7058,9 +7058,9 @@
+@@ -7156,9 +7156,9 @@
      "expiry_milestone": 123
    },
    {
@@ -25,11 +25,11 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 +    "expiry_milestone": -1
    },
    {
-     "name": "rounded-display",
+     "name": "revamp-page-info-ios",
 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
-@@ -3078,7 +3078,7 @@ const char kResetShortcutCustomizationsDescription[] =
+@@ -3040,7 +3040,7 @@ const char kResetShortcutCustomizationsDescription[] =
 
  const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
  const char kRestrictGamepadAccessDescription[] =