v109 fix build (fixup)

From: Your Name <you@example.com>

Date: Thu, 5 Jan 2023 11:48:07 +0000

Subject: Add a proxy configuration page (add fixup)

---

 chrome/browser/resources/proxy_config.js   | 13 ++++++++++++-

 chrome/browser/ui/webui/proxy_config_ui.cc |  2 +-

 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources/proxy_config.js

--- a/chrome/browser/resources/proxy_config.js

+++ b/chrome/browser/resources/proxy_config.js

@@ -16,7 +16,6 @@

 */

 import {$} from 'chrome://resources/js/util.js';

-import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';

 /**

  * Main entry point called once the page has loaded.

@@ -60,6 +59,18 @@ var ProxyConfigView = (function() {

   var kIdFtpProxies = 'ftp-proxies';

   var kIdFallbackProxies = 'fallback-proxies';

+  /**

+  * Adds a {@code getInstance} static method that always return the same

+  * instance object.

+  * @param {!Function} ctor The constructor for the class to add the static

+  *     method to.

+  */

+  function addSingletonGetter(ctor) {

+    ctor.getInstance = function() {

+      return ctor.instance_ || (ctor.instance_ = new ctor());

+    };

+  }

+

   /**

    * @constructor

    */

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

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

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

@@ -164,7 +164,7 @@ void ProxyConfigMessageHandler::OnProxyConfigChanged(

   // call Javascript function

   web_ui()->CallJavascriptFunctionUnsafe("ProxyConfigView.getInstance().onProxyConfigChanged",

-                                         *state.CreateDeepCopy());

+                                         state.Clone());

 }

 const std::string omitDirect(const std::string pacString) {

--

2.25.1

From: Your Name <you@example.com>

Date: Thu, 5 Jan 2023 11:37:12 +0000

Subject: Add webGL site setting (add fixup)

---

 .../core/browser/content_settings_registry.cc               | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc

--- a/components/content_settings/core/browser/content_settings_registry.cc

+++ b/components/content_settings/core/browser/content_settings_registry.cc

@@ -636,9 +636,9 @@ void ContentSettingsRegistry::Init() {

   Register(ContentSettingsType::WEBGL, "webgl", CONTENT_SETTING_BLOCK,

            WebsiteSettingsInfo::SYNCABLE,

-           AllowlistedSchemes(),

-           ValidSettings(CONTENT_SETTING_ALLOW,

-                         CONTENT_SETTING_BLOCK),

+           /*allowlisted_schemes=*/{},

+           /*valid_settings=*/{CONTENT_SETTING_ALLOW,

+                               CONTENT_SETTING_BLOCK},

            WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,

            WebsiteSettingsRegistry::PLATFORM_ANDROID,

            ContentSettingsInfo::INHERIT_IN_INCOGNITO,

--

2.25.1

From: Your Name <you@example.com>

Date: Thu, 5 Jan 2023 11:37:41 +0000

Subject: Add webRTC site settings (add fixup)

---

 .../core/browser/content_settings_registry.cc               | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc

--- a/components/content_settings/core/browser/content_settings_registry.cc

+++ b/components/content_settings/core/browser/content_settings_registry.cc

@@ -650,9 +650,9 @@ void ContentSettingsRegistry::Init() {

   Register(ContentSettingsType::WEBRTC, "webrtc", CONTENT_SETTING_BLOCK,

            WebsiteSettingsInfo::SYNCABLE,

-           AllowlistedSchemes(),

-           ValidSettings(CONTENT_SETTING_ALLOW,

-                         CONTENT_SETTING_BLOCK),

+           /*allowlisted_schemes=*/{},

+           /*valid_settings=*/{CONTENT_SETTING_ALLOW,

+                               CONTENT_SETTING_BLOCK},

            WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,

            WebsiteSettingsRegistry::PLATFORM_ANDROID,

            ContentSettingsInfo::INHERIT_IN_INCOGNITO,

--

2.25.1

From: Your Name <you@example.com>

Date: Sun, 18 Dec 2022 16:38:48 +0000

Subject: Client hints overrides (add fixup)

---

 .../blink/renderer/platform/runtime_enabled_features.json5    | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5

--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5

+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -2832,8 +2832,8 @@

       public: true,

     },

     {

-      name: "UserAgentClientHint",

-      status: "stable",

+      name: "UserAgentClientHint",  // always disabled

+      status: "experimental",       // in bromite

       base_feature: "UserAgentClientHint",

     },

     {

--

2.25.1

From: Your Name <you@example.com>

Date: Thu, 5 Jan 2023 11:35:28 +0000

Subject: Disable all predictors code (add fixup)

---

 components/optimization_guide/core/BUILD.gn | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/optimization_guide/core/BUILD.gn b/components/optimization_guide/core/BUILD.gn

--- a/components/optimization_guide/core/BUILD.gn

+++ b/components/optimization_guide/core/BUILD.gn

@@ -77,12 +77,14 @@ static_library("model_executor") {

   }

   deps = [

     ":features",

-    ":machine_learning",

     "//base",

     "//components/optimization_guide/proto:optimization_guide_proto",

     "//net",

     "//url",

   ]

+  if (build_with_tflite_lib) {

+    deps += [ ":machine_learning", ]

+  }

 }

 mojom("interfaces") {

--

2.25.1