chore: bump chromium to 114.0.5710.0 (main) (#37950)

* chore: bump chromium in DEPS to 114.0.5710.0

* chore: update patches

* 4411421: [json-schema-compiler] Support separating numbers in enum entries |
https://chromium-review.googlesource.com/c/chromium/src/+/4411421

* 4400251: Remove MayBlock and TaskShutdownBehavior from BrowserTaskTraits |
https://chromium-review.googlesource.com/c/chromium/src/+/4400251

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <[email protected]>
Co-authored-by: VerteDinde <[email protected]>

DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '114.0.5708.0',
+    '114.0.5710.0',
   'node_version':
     'v18.15.0',
   'nan_version':

patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -33,10 +33,10 @@ index 50a1715278cb1bbc25bd2270860b41229e884000..e53c59416a088dca3757d873a40120ac
            "//base",
            "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index eb0ae4a9ac6ac6f81980ddfd502ea29e4242478f..f8d04bac46ee27a819adb7b886e1a166837d8735 100644
+index 6b1cd116564be4257c0d17a2fe89c809bba30798..f2c294ce29b3eae2f07489393516591c4d9c7768 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4569,7 +4569,7 @@ static_library("browser") {
+@@ -4568,7 +4568,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index eb0ae4a9ac6ac6f81980ddfd502ea29e4242478f..f8d04bac46ee27a819adb7b886e1a166
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 16b465d70de8b61bda033389b07f7193a756b794..1c635968abf682354426c8a185f6c2bf527628d4 100644
+index bc6868fa3bfdf36e21af8458c768a35819447443..433d89a4205b0521fcd82fa0f9ed383e7d5e4fa7 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -6405,7 +6405,6 @@ test("unit_tests") {
+@@ -6406,7 +6406,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 16b465d70de8b61bda033389b07f7193a756b794..1c635968abf682354426c8a185f6c2bf
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:win_unit_tests",
-@@ -6431,6 +6430,10 @@ test("unit_tests") {
+@@ -6432,6 +6431,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 16b465d70de8b61bda033389b07f7193a756b794..1c635968abf682354426c8a185f6c2bf
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -7355,7 +7358,6 @@ test("unit_tests") {
+@@ -7356,7 +7359,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 16b465d70de8b61bda033389b07f7193a756b794..1c635968abf682354426c8a185f6c2bf
        "//chrome/browser/apps:icon_standardizer",
        "//chrome/browser/apps/app_service",
        "//chrome/browser/apps/app_service:test_support",
-@@ -7434,6 +7436,10 @@ test("unit_tests") {
+@@ -7435,6 +7437,10 @@ test("unit_tests") {
        "//ui/webui/resources/js/browser_command:mojo_bindings",
      ]
  

patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch

@@ -6,7 +6,7 @@ Subject: build: only use the mas build config in the required components
 Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts
 
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 058e2edda155ea73c29f70d81b2cbb6d3a709d9f..dfbcac6934da1a28f09afa4d60f26f1e1eaeebd5 100644
+index de465c107163124c6be79c3d10c2dd5678436b5a..b464fac54c13c176cca30bccd51dc25efdc8720b 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
 @@ -1030,6 +1030,7 @@ component("base") {
@@ -76,7 +76,7 @@ index 6926bd6766603f8de2237447c0a8fde2d09b67b4..707a943dd2bbc89917bd4b5b0fbc1d42
  
    if (is_win) {
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 8750a47c50ddcc3e3c853639d9cadd8e66c7dcaa..3e54be9dc2a2dbcd65a5382fa179ca092b8cfe6e 100644
+index 6b988eeae6411649bc35321dd22805a5c5439fb5..e78f16518da14411ceb74c88be31ffce413f986e 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
 @@ -56,6 +56,7 @@ source_set("browser") {
@@ -112,7 +112,7 @@ index 3ec54c242fb920a53fcaa6d8040f2ec88c2727df..27dee1596183d2ead5290a60c08e47e6
  
    public_deps = [
 diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
-index 5e9f447e4d946cd48d7b18d81c256baa169f93ea..fcfda1b4fde66c39b53a52d57c5e57b7f239bda1 100644
+index 642afd72cc0f98fe2590cef0c470f378eabb939e..894769a5de698767117339cab0fc2942d1a20b90 100644
 --- a/device/bluetooth/BUILD.gn
 +++ b/device/bluetooth/BUILD.gn
 @@ -240,6 +240,7 @@ component("bluetooth") {
@@ -253,7 +253,7 @@ index 20e72272bfd36d8411e7ecb8a83c75d9f95632e4..9784269499bccc19161a613aa1bb3a35
  
    if (is_win) {
 diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
-index 171bc18462841b58dd31c58bbb000abac852337d..2eaa15b5aba46a796905ed45d893db17d566af15 100644
+index 34a269ee4d47a2597fd098bc9eabe10685f4fc86..8a96f5abc4e0092bca15dbf6e5098a64d81a3ff7 100644
 --- a/ui/gfx/BUILD.gn
 +++ b/ui/gfx/BUILD.gn
 @@ -193,6 +193,7 @@ component("gfx") {

patches/chromium/can_create_window.patch

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 43c31d210e70f28d5da8b05d0348bc8bf762ecf9..8becad9c30cfb15fda735ced3dbbe7ab81949b91 100644
+index 24563bf259de8735e161ff462711ac2f3b96c738..46e8acf1267ffb24de71c4239121e787f5291fd4 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -7702,6 +7702,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -7710,6 +7710,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -66,10 +66,10 @@ index 12f4a2066a2a31e9852216c0cb3344095c7b0e39..588ca46227c58f9596317d6d4d05d0b3
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index b789b7b1bbe4ef23df29da44883f69195dc784fd..772bd32d27f1c54410f2f0ce2784616b4dc49ef9 100644
+index bf19525ff2a04cbaccd519de35bb25880a255892..233c048f9afb3f3bcdc1ff2d071730379f4f7e22 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -640,6 +640,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -635,6 +635,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -79,7 +79,7 @@ index b789b7b1bbe4ef23df29da44883f69195dc784fd..772bd32d27f1c54410f2f0ce2784616b
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 57ffe3e1603c24abcb8df1ec2a8192160afb07e3..0a65089a09c7d7d157d1facdfa4efd289e77edbb 100644
+index 3a843b83b86f868998ea9c2289874eb89fdec41a..b0534cbc6754f313b798436b39146da59d3fb32c 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -165,6 +165,7 @@ class NetworkService;
@@ -90,7 +90,7 @@ index 57ffe3e1603c24abcb8df1ec2a8192160afb07e3..0a65089a09c7d7d157d1facdfa4efd28
  }  // namespace network
  
  namespace sandbox {
-@@ -1038,6 +1039,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1031,6 +1032,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -189,33 +189,33 @@ index 22254206063abe36739e1c0e7c065223ab6807d2..7f5d89f8dc8b46ac1338e73b03948725
                         bool opener_suppressed,
                         bool* no_javascript_access) override;
 diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
-index 19e505a2d434dfd219b12304238e3b654eb8395f..314d1e63c55fae58e9f7ad0ce10045d3133f4882 100644
+index 4156256596276015ca3205b0f49f69d1ab47208e..271bc153afe3e3bfa98a7baa6ae4f92285d41929 100644
 --- a/third_party/blink/public/web/web_window_features.h
 +++ b/third_party/blink/public/web/web_window_features.h
-@@ -34,6 +34,7 @@
- #include "third_party/abseil-cpp/absl/types/optional.h"
+@@ -32,6 +32,7 @@
+ #define THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_WINDOW_FEATURES_H_
  
- #include "third_party/blink/public/common/navigation/impression.h"
+ #include "third_party/blink/public/platform/web_string.h"
 +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
  
  namespace blink {
  
 @@ -68,6 +69,8 @@ struct WebWindowFeatures {
-   // Represents the attribution source declared by Attribution Reporting related
-   // window features, if any.
-   absl::optional<Impression> impression;
+   // request should be made. Otherwise, an impression should be set and a
+   // background request should be made to the contained relative URL.
+   WebString attribution_src;
 +
 +  String raw_features;
  };
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 6e4235ff40d88880e5928cbca2a593264d6da527..814781746df6fd0b2cedc2f3aa77759aa1c7a868 100644
+index 805528d51c5eef239154be54d4d484db15cb0d4d..2d75600164d736b8d6ecf3855681c4f076b6e181 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2212,6 +2212,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2217,6 +2217,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
    WebWindowFeatures window_features =
-       GetWindowFeaturesFromString(features, entered_window, completed_url);
+       GetWindowFeaturesFromString(features, entered_window);
  
 +  window_features.raw_features = features;
 +

patches/chromium/crash_allow_setting_more_options.patch

@@ -31,18 +31,18 @@ index 284dd099122df85d2cebf467cdb3a54b45a343eb..bb21ddbd2ee4d2952a4b753a5c553005
  unsigned int CrashReporterClient::GetCrashDumpPercentage() {
    return 100;
 diff --git a/components/crash/core/app/crash_reporter_client.h b/components/crash/core/app/crash_reporter_client.h
-index 9f8f20dfa65068a13ce3b035a7e3ce062d767161..9b45c7276e97253f79f4555ee692687b040afa67 100644
+index a604df7a5ea6a1f5613acc032a65668364aadf89..93a8bf787bdaa0e4251a41453eb22062646f4bcb 100644
 --- a/components/crash/core/app/crash_reporter_client.h
 +++ b/components/crash/core/app/crash_reporter_client.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
- #define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
+@@ -7,6 +7,7 @@
+ 
+ #include <stdint.h>
  
 +#include <map>
  #include <string>
  
  #include "build/build_config.h"
-@@ -151,6 +152,19 @@ class CrashReporterClient {
+@@ -153,6 +154,19 @@ class CrashReporterClient {
    // that case, |breakpad_enabled| is set to the value enforced by policies.
    virtual bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled);
  

patches/chromium/disable_color_correct_rendering.patch

@@ -81,10 +81,10 @@ index c7ca2458708dd9577afdaef7fbcafaaa68046904..c4a1f1368ef053830c86cf86c3bec7ce
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index cb05dfa656174c132157a1ca283da2dad50c2423..fe38ee99ed053f41680a413883739cf7b359cf6a 100644
+index 9e53989c27763d082dabbaee2149206906977d10..7f6698c75db98e0a239a9144c73362f5ec2b38bd 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
-@@ -225,6 +225,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
+@@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
  
  // Command-line switches to propagate to the GPU process.
  static const char* const kSwitchNames[] = {

patches/chromium/expose_setuseragent_on_networkcontext.patch

@@ -33,7 +33,7 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 2d7164b668bb3326bd55bc7e70b102d9286d1a7f..1d17fe55f14f44fe8cb6dbcab593be950bc41a9e 100644
+index 1776f32fde50f96c8aeaa26044791a9dd6c5f821..60b76e813b41700c4ddb5594d951ffbf4b352658 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -1454,6 +1454,13 @@ void NetworkContext::SetNetworkConditions(

patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch

@@ -17,7 +17,7 @@ policy->CanCommitOriginAndUrl.
 Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
 
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index b75e80275f853681f5337a2815fe0363a33290fa..9e57f07d0297126bdc24e4c06c18b171abedfcca 100644
+index 0d6a0433137a3598ff2bb102296d5f39d7b53298..1407049bc11a8f171f9cf6fe4c8567a0b80ad411 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
 @@ -7370,10 +7370,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {

patches/chromium/frame_host_manager.patch

@@ -20,7 +20,7 @@ index abd38c92d0f00dec0c52569b7db627917e457ccf..3943ead8fbdb241fc6e299f34a376d3a
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 0a65089a09c7d7d157d1facdfa4efd289e77edbb..8ee31a2467d5aa2c69613ef4da2a4bd241801890 100644
+index b0534cbc6754f313b798436b39146da59d3fb32c..9adb63bec130fb279889eff5b5a1cf952cd97d28 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -276,6 +276,11 @@ class CONTENT_EXPORT ContentBrowserClient {

patches/chromium/gritsettings_resource_ids.patch

@@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 512ff40f41c675cc1db75a5a5bac7c1a4b111ace..83fe7aa86a736fb2f973830359ed5760e5aae0bd 100644
+index d672211e6f5cc53838bef3f446fca4c7311f4f4a..265b149f98ad12e34e18219b7491e108bc5fcc18 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
 @@ -1111,6 +1111,11 @@

patches/chromium/network_service_allow_remote_certificate_verification_logic.patch

@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index b7579e5bbf3af23c6fc5aa4fbf06b720878bbea3..2d7164b668bb3326bd55bc7e70b102d9286d1a7f 100644
+index 069dc5d5848ebcf2812fe74f55b577c65496ae2f..1776f32fde50f96c8aeaa26044791a9dd6c5f821 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -138,6 +138,11 @@

patches/chromium/port_autofill_colors_to_the_color_pipeline.patch

@@ -8,10 +8,10 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.
 
 diff --git a/ui/color/color_id.h b/ui/color/color_id.h
-index 69d4b71f3068ad7c42d36b7e9f029cf14996a5da..e5c3a98f32be76619a2054e4b6da209e683080fe 100644
+index 015a88ea44e7eb60c89680e032f43b5e16d6daa1..9302b3f44e0797e3453e27ae204924cf2fa3b2b0 100644
 --- a/ui/color/color_id.h
 +++ b/ui/color/color_id.h
-@@ -352,6 +352,10 @@
+@@ -355,6 +355,10 @@
    E_CPONLY(kColorScrollbarThumbInactive) \
    E_CPONLY(kColorScrollbarThumbPressed) \
    E_CPONLY(kColorScrollbarTrack) \
@@ -22,7 +22,7 @@ index 69d4b71f3068ad7c42d36b7e9f029cf14996a5da..e5c3a98f32be76619a2054e4b6da209e
    E_CPONLY(kColorSeparator) \
    E_CPONLY(kColorShadowBase) \
    E_CPONLY(kColorShadowValueAmbientShadowElevationSixteen) \
-@@ -425,6 +429,7 @@
+@@ -428,6 +432,7 @@
    E_CPONLY(kColorTreeNodeForeground) \
    E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
    E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \

patches/chromium/printing.patch

@@ -834,7 +834,7 @@ index 146fbcb2e6bd4348110ecc3220d6ac0ac59babf3..eecc3118033ef7fe1f17aba48cd19b17
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index ded91b2bc9ce86d2214248724f7bf42519045ca8..8750a47c50ddcc3e3c853639d9cadd8e66c7dcaa 100644
+index 8f8eb52718f3f91779158bd203ad0e2dfa0e143d..6b988eeae6411649bc35321dd22805a5c5439fb5 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
 @@ -2852,8 +2852,9 @@ source_set("browser") {

patches/chromium/webview_fullscreen.patch

@@ -14,7 +14,7 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 8becad9c30cfb15fda735ced3dbbe7ab81949b91..24e4cac898aacca46ccb970070fd361ba88ae140 100644
+index 46e8acf1267ffb24de71c4239121e787f5291fd4..02c97ca28910ae663d6a23b40773c7f70fefec9d 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -6933,6 +6933,17 @@ void RenderFrameHostImpl::EnterFullscreen(

shell/browser/api/electron_api_web_contents.cc

@@ -497,8 +497,7 @@ scoped_refptr<base::TaskRunner> CreatePrinterHandlerTaskRunner() {
 #elif BUILDFLAG(IS_WIN)
   // Windows drivers are likely not thread-safe and need to be accessed on the
   // UI thread.
-  return content::GetUIThreadTaskRunner(
-      {base::MayBlock(), base::TaskPriority::USER_VISIBLE});
+  return content::GetUIThreadTaskRunner({base::TaskPriority::USER_VISIBLE});
 #else
   // Be conservative on unsupported platforms.
   return base::ThreadPool::CreateSingleThreadTaskRunner(kTraits);

shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc

@@ -45,13 +45,13 @@ void ElectronRuntimeAPIDelegate::OpenURL(const GURL& uninstall_url) {}
 bool ElectronRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
   const char* os = update_client::UpdateQueryParams::GetOS();
   if (strcmp(os, "mac") == 0) {
-    info->os = extensions::api::runtime::PLATFORM_OS_MAC;
+    info->os = extensions::api::runtime::PlatformOs::kMac;
   } else if (strcmp(os, "win") == 0) {
-    info->os = extensions::api::runtime::PLATFORM_OS_WIN;
+    info->os = extensions::api::runtime::PlatformOs::kWin;
   } else if (strcmp(os, "linux") == 0) {
-    info->os = extensions::api::runtime::PLATFORM_OS_LINUX;
+    info->os = extensions::api::runtime::PlatformOs::kLinux;
   } else if (strcmp(os, "openbsd") == 0) {
-    info->os = extensions::api::runtime::PLATFORM_OS_OPENBSD;
+    info->os = extensions::api::runtime::PlatformOs::kOpenbsd;
   } else {
     NOTREACHED();
     return false;
@@ -59,13 +59,13 @@ bool ElectronRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
 
   const char* arch = update_client::UpdateQueryParams::GetArch();
   if (strcmp(arch, "arm") == 0) {
-    info->arch = extensions::api::runtime::PLATFORM_ARCH_ARM;
+    info->arch = extensions::api::runtime::PlatformArch::kArm;
   } else if (strcmp(arch, "arm64") == 0) {
-    info->arch = extensions::api::runtime::PLATFORM_ARCH_ARM64;
+    info->arch = extensions::api::runtime::PlatformArch::kArm64;
   } else if (strcmp(arch, "x86") == 0) {
-    info->arch = extensions::api::runtime::PLATFORM_ARCH_X86_32;
+    info->arch = extensions::api::runtime::PlatformArch::kX86_32;
   } else if (strcmp(arch, "x64") == 0) {
-    info->arch = extensions::api::runtime::PLATFORM_ARCH_X86_64;
+    info->arch = extensions::api::runtime::PlatformArch::kX86_64;
   } else {
     NOTREACHED();
     return false;
@@ -73,14 +73,14 @@ bool ElectronRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
 
   const char* nacl_arch = update_client::UpdateQueryParams::GetNaclArch();
   if (strcmp(nacl_arch, "arm") == 0) {
-    info->nacl_arch = extensions::api::runtime::PLATFORM_NACL_ARCH_ARM;
+    info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kArm;
   } else if (strcmp(nacl_arch, "arm64") == 0) {
     // Use ARM for ARM64 NaCl, as ARM64 NaCl is not available.
-    info->nacl_arch = extensions::api::runtime::PLATFORM_NACL_ARCH_ARM;
+    info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kArm;
   } else if (strcmp(nacl_arch, "x86-32") == 0) {
-    info->nacl_arch = extensions::api::runtime::PLATFORM_NACL_ARCH_X86_32;
+    info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kX86_32;
   } else if (strcmp(nacl_arch, "x86-64") == 0) {
-    info->nacl_arch = extensions::api::runtime::PLATFORM_NACL_ARCH_X86_64;
+    info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kX86_64;
   } else {
     NOTREACHED();
     return false;