Rebase to 130 (#1547)

Rebase to 130

build/RELEASE

@@ -1 +1 @@
-129.0.6668.101
+130.0.6723.44

build/cromite_patches_list.txt

@@ -217,7 +217,6 @@ Disable-GSA-by-default.patch
 Disallowing-MIDI-permission-by-default.patch
 Disable-Compression-Dictionary-Transport.patch
 Disallow-Android-App-Scheme-as-referrer.patch
-Deprecate-Data-URL-in-SVGUseElement.patch
 Content-settings-infrastructure.patch
 Add-autoplay-site-setting.patch
 Site-setting-for-images.patch

build/patches/AImageReader-CFI-crash-mitigations.patch

@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 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
-@@ -3406,9 +3406,9 @@
+@@ -3430,9 +3430,9 @@
      "expiry_milestone": 135
    },
    {
@@ -168,8 +168,8 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
  #if BUILDFLAG(IS_ANDROID)
 +GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);
  GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);
- GPU_EXPORT BASE_DECLARE_FEATURE(kEnableGpuMemoryBufferImplAHB);
  GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);
+ GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControlForTV);
 diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 --- a/gpu/config/gpu_util.cc
 +++ b/gpu/config/gpu_util.cc

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
-@@ -233,6 +233,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;
-@@ -1054,6 +1055,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1045,6 +1046,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
 
          ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
          ChromeCachedFlags.getInstance().cacheNativeFlags();
@@ -56,10 +56,10 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =
              "AccountReauthenticationRecentTimeWindow";
 +    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
-     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =
-             "AdaptiveButtonInTopToolbarTranslate";
-     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =
-@@ -572,6 +573,8 @@ public abstract class ChromeFeatureList {
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
+             "AdaptiveButtonInTopToolbarPageSummary";
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
+@@ -583,6 +584,8 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =
              newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);
      public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,14 +68,14 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sAsyncNotificationManager =
              newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);
      public static final CachedFlag sBackGestureActivityTabProvider =
-@@ -726,6 +729,7 @@ public abstract class ChromeFeatureList {
+@@ -746,6 +749,7 @@ public abstract class ChromeFeatureList {
      public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
              List.of(
                      sAccountReauthenticationRecentTimeWindow,
 +                    sAllowUserCertificates,
                      sAndroidAppIntegration,
+                     sAndroidBottomToolbar,
                      sAndroidElegantTextHeight,
-                     sAndroidGoogleSansText,
 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-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
-@@ -390,6 +390,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -391,6 +391,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
        }
      }
 

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -109,6 +109,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
+@@ -108,6 +108,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
               FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_ANDROID)
 

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

@@ -14,8 +14,8 @@ 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
-@@ -7908,9 +7908,9 @@
-     "expiry_milestone": 130
+@@ -7884,9 +7884,9 @@
+     "expiry_milestone" : 130
    },
    {
 -    "name": "restrict-gamepad-access",
@@ -25,19 +25,19 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 +    "expiry_milestone": -1
    },
    {
-     "name": "revamp-page-info-ios",
+     "name": "retain-omnibox-on-focus",
 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
-@@ -3298,7 +3298,7 @@ const char kResetShortcutCustomizationsDescription[] =
+@@ -3329,7 +3329,7 @@ const char kResetShortcutCustomizationsDescription[] =
 
  const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
  const char kRestrictGamepadAccessDescription[] =
 -    "Enables Permissions Policy and Secure Context restrictions on the Gamepad "
 +    "Disable the Gamepad "
      "API";
 
- const char kRippleForEnhancedProtectionName[] =
+ #if BUILDFLAG(IS_ANDROID)
 diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc
 --- a/device/gamepad/public/cpp/gamepad_features.cc
 +++ b/device/gamepad/public/cpp/gamepad_features.cc

build/patches/Add-a-proxy-configuration-page.patch

@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 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
-@@ -73,6 +73,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -75,6 +75,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private static final String PREF_SAFE_BROWSING = "safe_browsing";
      private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
      private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 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
-@@ -319,6 +319,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -318,6 +318,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
    builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
  #endif
    builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
@@ -99,7 +99,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -244,6 +244,9 @@
+@@ -239,6 +239,9 @@
          <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />
          <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_list_file}" use_base_dir="false" type="BINDATA" />
        </if>
@@ -196,7 +196,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -201,6 +201,8 @@
+@@ -203,6 +203,8 @@
  #include "printing/buildflags/buildflags.h"
  #include "rlz/buildflags/buildflags.h"
 
@@ -205,7 +205,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
  #include "chrome/browser/background/background_mode_manager.h"
  #endif
-@@ -1496,6 +1498,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1577,6 +1579,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    component_updater::RegisterPrefs(registry);
    domain_reliability::RegisterPrefs(registry);
    embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -660,7 +660,7 @@ new file mode 100644
 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
-@@ -336,6 +336,8 @@ static_library("ui") {
+@@ -281,6 +281,8 @@ static_library("ui") {
      "webui/metrics_internals/metrics_internals_ui.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
@@ -672,23 +672,23 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -50,6 +50,7 @@
- #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h"
- #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
+@@ -46,6 +46,7 @@
+ #include "chrome/browser/ui/webui/media/media_engagement_ui.h"
+ #include "chrome/browser/ui/webui/media/webrtc_logs_ui.h"
  #include "chrome/browser/ui/webui/policy/policy_ui.h"
 +#include "chrome/browser/ui/webui/proxy_config_ui.h"
- #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
  #include "chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_ui.h"
- #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h"
-@@ -419,6 +420,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
-   if (url.host_piece() == chrome::kChromeUINetExportHost)
-     return &NewWebUI<NetExportUI>;
+ #include "chrome/browser/ui/webui/suggest_internals/suggest_internals_ui.h"
+ #include "chrome/browser/ui/webui/webui_util.h"
+@@ -532,6 +533,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+     return &NewWebUI<SyncConfirmationUI>;
+   }
+ #endif  // BUILDFLAG(IS_ANDROID)
 +  if (url.host_piece() == chrome::kChromeUIProxyConfigHost)
 +    return &NewWebUI<ProxyConfigUI>;
-   if (url.host_piece() == chrome::kChromeUINetInternalsHost)
-     return &NewWebUI<NetInternalsUI>;
-   if (url.host_piece() == chrome::kChromeUINTPTilesInternalsHost)
+ #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
+   if (url.host_piece() == chrome::kChromeUIManagedUserProfileNoticeHost) {
+     return &NewWebUI<ManagedUserProfileNoticeUI>;
 diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc
 new file mode 100644
 --- /dev/null
@@ -1141,7 +1141,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -171,6 +171,8 @@ inline constexpr char kChromeUINetExportURL[] = "chrome://net-export";
+@@ -176,6 +176,8 @@ inline constexpr char kChromeUINetExportURL[] = "chrome://net-export";
  inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
  inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
  inline constexpr char kChromeUINewTabHost[] = "newtab";
@@ -1319,16 +1319,16 @@ diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_
 diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc
 --- a/net/proxy_resolution/proxy_config.cc
 +++ b/net/proxy_resolution/proxy_config.cc
-@@ -109,7 +109,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
-                                    &single_proxies,
-                                    ProxyServer::SCHEME_HTTP);
+@@ -124,7 +124,7 @@ void ProxyConfig::ProxyRules::ParseFromString(
+                                    ProxyServer::SCHEME_HTTP,
+                                    allow_bracketed_proxy_chains);
          type = Type::PROXY_LIST;
 -        return;
 +        continue;
        }
 
        // Trim whitespace off the url scheme.
-@@ -140,6 +140,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+@@ -155,6 +155,55 @@ void ProxyConfig::ProxyRules::ParseFromString(
    }
  }
 
@@ -1383,14 +1383,14 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +
  const ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyList(
      const std::string& url_scheme) const {
-   const ProxyList* proxy_server_list = const_cast<ProxyRules*>(this)->
+   const ProxyList* proxy_server_list =
 diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_config.h
 --- a/net/proxy_resolution/proxy_config.h
 +++ b/net/proxy_resolution/proxy_config.h
-@@ -103,6 +103,9 @@ class NET_EXPORT ProxyConfig {
-     //                                  and use socks4://foopy2 for all other
+@@ -108,6 +108,9 @@ class NET_EXPORT ProxyConfig {
      //                                  URLs.
-     void ParseFromString(const std::string& proxy_rules);
+     void ParseFromString(const std::string& proxy_rules,
+                          bool allow_bracketed_proxy_chains = false);
 +    // Returns the proxy rules in a format that can be parsed by ParseFromString;
 +    // all information except bypass rules is used.
 +    std::string ToString() const;