Update cromite patches

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

@@ -3408,6 +3408,10 @@

@@ -3290,6 +3290,10 @@

     "name": "enable-identity-in-auth-error",

     "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],

     "expiry_milestone": 135

diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc

--- a/gpu/config/gpu_finch_features.cc

+++ b/gpu/config/gpu_finch_features.cc

@@ -53,6 +53,11 @@ BASE_FEATURE(kUseGles2ForOopR,

@@ -59,6 +59,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,

              base::FEATURE_DISABLED_BY_DEFAULT);

 #if BUILDFLAG(IS_ANDROID)

diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h

--- a/gpu/config/gpu_finch_features.h

+++ b/gpu/config/gpu_finch_features.h

@@ -24,6 +24,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);

 // All features in alphabetical order. The features should be documented

 // alongside the definition of their values in the .cc file.

@@ -26,6 +26,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);

 GPU_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits);

 #if BUILDFLAG(IS_ANDROID)

+GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);

 GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

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

@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(

@@ -125,6 +125,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(

 #if !BUILDFLAG(IS_ANDROID)

   return kGpuFeatureStatusDisabled;

 #else

   if (!gpu_preferences.enable_android_surface_control)

     return kGpuFeatureStatusDisabled;

@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,

@@ -378,6 +381,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,

           kGpuFeatureStatusSoftware;

     }

   }

 #endif

 #if BUILDFLAG(ENABLE_VULKAN)

@@ -702,6 +703,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

@@ -701,6 +702,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

   }

 #endif  // BUILDFLAG(IS_WIN)

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

@@ -227,6 +227,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;

@@ -223,6 +223,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.printing.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

@@ -1044,6 +1045,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -1056,6 +1057,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

         super.onStartWithNative();

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

         ChromeCachedFlags.getInstance().cacheNativeFlags();

+        X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled(

+                                            ChromeFeatureList.ALLOW_USER_CERTIFICATES);

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

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

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

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,

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

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

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

     /* Alphabetical: */

     public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =

             "AccountReauthenticationRecentTimeWindow";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -609,6 +610,8 @@ public abstract class ChromeFeatureList {

@@ -586,6 +587,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);

+            newCachedFlag(ALLOW_USER_CERTIFICATES, false);

     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);

     public static final CachedFlag sBackGestureActivityTabProvider =

@@ -780,6 +783,7 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sBlockIntentsWhileLocked =

@@ -744,6 +747,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

                     sAccountReauthenticationRecentTimeWindow,

+                    sAllowUserCertificates,

                     sAndroidAppIntegration,

                     sAndroidAppIntegrationV2,

                     sAndroidAppIntegrationWithFavicon,

                     sAndroidBottomToolbar,

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

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

@@ -392,6 +392,8 @@ public class KeyboardShortcuts {

@@ -403,6 +403,8 @@ public class KeyboardShortcuts {

                 R.string.keyboard_shortcut_address_bar,

                 KeyEvent.KEYCODE_L,

                 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

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

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

       }

     }

 chrome/browser/resources/proxy_config.html    |  77 ++++

 chrome/browser/resources/proxy_config.js      | 278 +++++++++++++

 chrome/browser/ui/BUILD.gn                    |   2 +

 .../webui/chrome_web_ui_controller_factory.cc |   5 +-

 .../browser/ui/webui/chrome_web_ui_configs.cc |   4 +

 chrome/browser/ui/webui/proxy_config_ui.cc    | 389 ++++++++++++++++++

 chrome/browser/ui/webui/proxy_config_ui.h     |  31 ++

 chrome/browser/ui/webui/proxy_config_ui.h     |  41 ++

 chrome/common/webui_url_constants.cc          |   2 +

 chrome/common/webui_url_constants.h           |   2 +

 .../pref_proxy_config_tracker_impl.cc         |   5 +-

 .../proxy_config/proxy_policy_handler.cc      |   2 +-

 net/proxy_resolution/proxy_config.cc          |  51 ++-

 net/proxy_resolution/proxy_config.h           |   3 +

 25 files changed, 974 insertions(+), 18 deletions(-)

 25 files changed, 984 insertions(+), 17 deletions(-)

 create mode 100644 chrome/browser/resources/proxy_config.css

 create mode 100644 chrome/browser/resources/proxy_config.html

 create mode 100644 chrome/browser/resources/proxy_config.js

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

@@ -75,6 +75,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

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

diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc

--- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc

+++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc

@@ -392,7 +392,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(

@@ -372,7 +372,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(

         return std::nullopt;

       }

       return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string,

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

@@ -202,6 +202,8 @@

@@ -198,6 +198,8 @@

 #include "printing/buildflags/buildflags.h"

 #include "rlz/buildflags/buildflags.h"

 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)

 #include "chrome/browser/background/background_mode_manager.h"

 #endif

@@ -1652,6 +1654,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

@@ -1615,6 +1617,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

   component_updater::RegisterPrefs(registry);

   domain_reliability::RegisterPrefs(registry);

   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);

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

@@ -238,6 +238,8 @@ static_library("ui") {

@@ -224,6 +224,8 @@ static_library("ui") {

     "webui/metrics_internals/metrics_internals_ui.h",

     "webui/net_export_ui.cc",

     "webui/net_export_ui.h",

     "webui/net_internals/net_internals_ui.cc",

     "webui/net_internals/net_internals_ui.h",

     "webui/ntp_tiles_internals_ui.cc",

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

@@ -32,6 +32,7 @@

 #include "chrome/browser/ui/webui/about/about_ui.h"

 #include "chrome/browser/ui/webui/components/components_ui.h"

 #include "chrome/browser/ui/webui/crashes_ui.h"

diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc

--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc

@@ -56,6 +56,9 @@

 #include "extensions/buildflags/buildflags.h"

 #include "printing/buildflags/buildflags.h"

+#include "chrome/browser/ui/webui/proxy_config_ui.h"

 #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h"

 #include "chrome/browser/ui/webui/flags/flags_ui.h"

 #include "chrome/browser/ui/webui/webui_util.h"

@@ -261,7 +262,9 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,

       history_clusters_internals::kChromeUIHistoryClustersInternalsHost) {

     return &NewWebUI<HistoryClustersInternalsUI>;

+

+

 #if BUILDFLAG(ENABLE_NACL)

 #include "chrome/browser/ui/webui/nacl_ui.h"

 #endif

@@ -410,4 +413,5 @@ void RegisterChromeWebUIConfigs() {

   map.AddWebUIConfig(std::make_unique<SigninErrorUIConfig>());

   map.AddWebUIConfig(std::make_unique<SigninEmailConfirmationUIConfig>());

 #endif  //  !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)

+  map.AddWebUIConfig(std::make_unique<ProxyConfigUIConfig>());

 }

-

+  if (url.host_piece() == chrome::kChromeUIProxyConfigHost) {

+    return &NewWebUI<ProxyConfigUI>;

+  }

 #if !BUILDFLAG(IS_ANDROID)

   if (url.host_piece() == chrome::kChromeUINewTabHost) {

     // The URL chrome://newtab/ can be either a virtual or a real URL,

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

+      state.SetByDottedPath("config.rules.fallback_proxies", base::Value(omitDirect(rules.fallback_proxies.ToPacString())));

+      break;

+    default:

+     NOTREACHED_NORETURN();

+     NOTREACHED();

+  }

+  state.SetByDottedPath("config.rules.type", base::Value(type));

+  state.SetByDottedPath("config.rules.bypass_rules", base::Value(rules.bypass_rules.ToString()));

new file mode 100644

--- /dev/null

+++ b/chrome/browser/ui/webui/proxy_config_ui.h

@@ -0,0 +1,31 @@

@@ -0,0 +1,41 @@

+/*

+    This file is part of Bromite.

+

+#ifndef CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_

+#define CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_

+

+#include "chrome/common/webui_url_constants.h"

+#include "content/public/browser/web_ui_controller.h"

+#include "content/public/browser/webui_config.h"

+

+// The WebUI for chrome://proxy/.

+class ProxyConfigUI : public content::WebUIController {

+  explicit ProxyConfigUI(content::WebUI* web_ui);

+};

+

+class ProxyConfigUIConfig

+    : public content::DefaultWebUIConfig<ProxyConfigUI> {

+ public:

+  ProxyConfigUIConfig()

+      : DefaultWebUIConfig(content::kChromeUIScheme,

+                           chrome::kChromeUIProxyConfigHost) {}

+};

+

+#endif  // CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_

diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc

--- a/chrome/common/webui_url_constants.cc

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

@@ -131,7 +131,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,

             url_scheme, &single_proxies, ProxyServer::SCHEME_HTTP,

@@ -129,7 +129,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,

             std::move(url_scheme), &single_proxies, ProxyServer::SCHEME_HTTP,

             allow_bracketed_proxy_chains, is_quic_allowed);

         type = Type::PROXY_LIST;

-        return;

       }

       // Trim whitespace off the url scheme.

@@ -162,6 +162,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,

@@ -160,6 +160,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,

   }

 }