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

@@ -3224,6 +3224,10 @@

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

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

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

              base::FEATURE_DISABLED_BY_DEFAULT);

 #if BUILDFLAG(IS_ANDROID)

   if (!gpu_preferences.enable_android_surface_control)

     return kGpuFeatureStatusDisabled;

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

@@ -348,6 +351,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,

           kGpuFeatureStatusSoftware;

     }

   }

 #endif

 #if BUILDFLAG(ENABLE_VULKAN)

@@ -715,6 +716,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

@@ -692,6 +693,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

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

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

@@ -968,6 +969,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -969,6 +970,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

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

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

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

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

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -624,6 +625,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =

             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);

@@ -643,6 +644,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidMinimalUiLargeScreen =

             newCachedFlag(ANDROID_MINIMAL_UI_LARGE_SCREEN, false);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);

+    public static final CachedFlag sAllowUserCertificates =

+            newCachedFlag(ALLOW_USER_CERTIFICATES, false);

     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);

     public static final CachedFlag sBlockIntentsWhileLocked =

@@ -845,6 +848,7 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAsyncNotificationManagerForDownload =

@@ -878,6 +881,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

                     sAndroidAppIntegration,

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

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

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

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

 .../browser/ui/webui/chrome_web_ui_configs.cc |   5 +-

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

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

 chrome/common/webui_url_constants.cc          |   2 +

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

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

 net/proxy_resolution/proxy_config.h           |   3 +

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

 25 files changed, 984 insertions(+), 18 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

+      <!-- Bromite Proxy Configuration UI -->

+      <include name="IDR_PROXY_CONFIG_HTML" file="resources\proxy_config.html" flattenhtml="true" type="BINDATA" compress="gzip" />

+      <include name="IDR_PROXY_CONFIG_JS" file="resources\proxy_config.js" type="BINDATA" compress="gzip" />

       <if expr="not is_android">

       <if expr="not is_android or enable_extensions_core">

         <!-- Page not available for guest. -->

         <include name="IDR_PAGE_NOT_AVAILABLE_FOR_GUEST_APP_HTML" file="resources\page_not_available_for_guest\app.html" type="BINDATA" />

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

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

@@ -200,6 +200,8 @@

@@ -196,6 +196,8 @@

 #include "printing/buildflags/buildflags.h"

 #include "rlz/buildflags/buildflags.h"

+#include "chrome/browser/net/proxy_service_factory.h"

+

 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)

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

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

 #endif

@@ -1644,6 +1646,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

@@ -1561,6 +1563,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

   component_updater::RegisterPrefs(registry);

   domain_reliability::RegisterPrefs(registry);

   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);

diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc

--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc

+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc

@@ -157,7 +157,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {

@@ -156,7 +156,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {

         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);

     SetValue(proxy_config::prefs::kProxy,

              base::Value(ProxyConfigDictionary::CreateFixedServers(

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

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

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

@@ -55,6 +55,9 @@

@@ -54,6 +54,9 @@

 #include "extensions/buildflags/buildflags.h"

 #include "printing/buildflags/buildflags.h"

 #if BUILDFLAG(ENABLE_NACL)

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

 #endif

@@ -388,4 +391,5 @@ void RegisterChromeWebUIConfigs() {

 #if BUILDFLAG(ENABLE_GLIC)

@@ -391,7 +394,7 @@ void RegisterChromeWebUIConfigs() {

   map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());

   map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());

 #endif

-

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

 }

 #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)

   map.AddWebUIConfig(

       std::make_unique<safe_browsing::ChromeSafeBrowsingUIConfig>());

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

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

@@ -160,6 +160,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export";

@@ -161,6 +161,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export";

 inline constexpr char kChromeUINetInternalsHost[] = "net-internals";

 inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";

 inline constexpr char kChromeUINewTabHost[] = "newtab";