chore: bump chromium to 4b6692e4cc2839729bb7ac009586a (master) (#21864)

* chore: bump chromium in DEPS to a1ea0d7aedd6b5fe58fbabfa3b05aa8ee41304ff

* update patches

* update extensions code

* Remove WebPoint

https://chromium-review.googlesource.com/c/chromium/src/+/2007474

* fix build

* chore: bump chromium in DEPS to 9351e26c2a3714f8bbb10789c71bb51b0b494c75

* update patches

* Remove error description from the DidFailLoadWithError message

https://chromium-review.googlesource.com/c/chromium/src/+/2011280

* Make SimpleNetworkHintsHandlerImpl use the right NetworkIsolationKey

https://chromium-review.googlesource.com/c/chromium/src/+/1994430

* Rename libgtkui to gtk

https://chromium-review.googlesource.com/c/chromium/src/+/2011683

* [metrics] Remove histogram Startup.WarmStartTimeFromRemoteProcessStart*.

https://chromium-review.googlesource.com/c/chromium/src/+/2003211

* fix requestSingleInstanceLock test

* chore: bump chromium in DEPS to a813567a4f17ea08292c2b26fa10d0ffd47010d9

* chore: bump chromium in DEPS to f0aca2de536ceecd6eb66e928051d11e6d11991f

* chore: bump chromium in DEPS to 865556af6d0c9d990f5b1816cb792f7c3859667b

* chore: bump chromium in DEPS to 98538fdd28c4b6692e4cc2839729bb7ac009586a

* update patches

* fix broken tests

* Update node tests for v8 changes

* Update node patches for test failures

* Update for number of tests

Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>

BUILD.gn

@@ -494,7 +494,7 @@ source_set("electron_lib") {
     deps += [
       ":libnotify_loader",
       "//build/config/linux/gtk",
-      "//chrome/browser/ui/libgtkui",
+      "//chrome/browser/ui/gtk",
       "//dbus",
       "//device/bluetooth",
       "//third_party/breakpad:client",

DEPS

@@ -12,7 +12,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '8fe78d4711fb243c83a66a7fded00f3408107778',
+    '98538fdd28c4b6692e4cc2839729bb7ac009586a',
   'node_version':
     'v12.14.1',
   'nan_version':

chromium_src/chrome/browser/process_singleton_win.cc

@@ -197,7 +197,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
     return PROCESS_NONE;
   }
 
-  switch (chrome::AttemptToNotifyRunningChrome(remote_window_, false)) {
+  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
     case chrome::NOTIFY_SUCCESS:
       return PROCESS_NOTIFIED;
     case chrome::NOTIFY_FAILED:

patches/chromium/.patches

@@ -22,7 +22,6 @@ boringssl_build_gn.patch
 pepper_plugin_support.patch
 no_cache_storage_check.patch
 blink_fix_prototype_assert.patch
-libgtkui_export.patch
 gtk_visibility.patch
 sysroot.patch
 mas_blink_no_private_api.patch

patches/chromium/add_realloc.patch

@@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
 
    GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 6dc5d6d39c4fa28fc4c303ff704267ad60b050f2..9fd95c25db36b8e5e02cd971ae30608fba027346 100644
+index 7aa84a3e19c257dde8f48d25743dc8ab2a3a0a30..58cbfc6e6f9f916ace683705d8a87ee05dc73422 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -657,6 +657,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+@@ -659,6 +659,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
          size, ArrayBufferContents::kDontInitialize);
    }
 

patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch

@@ -10,7 +10,7 @@ WebContents, and cancels the authentication if there's no WebContents
 available, which there isn't in the case of the 'net' module.
 
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 541d8017d38cbede3199e0028f3b1b260bd61b34..ec2e6d52d247fbcc9f07c54518f860d1a30822f4 100644
+index 78fd4bd72b07f38b447840b584253883756fe021..6d8aaecc08207456f243125db8e6d7c74f731d87 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
 @@ -191,6 +191,25 @@ struct HttpAuthStaticNetworkContextParams {
@@ -39,7 +39,7 @@ index 541d8017d38cbede3199e0028f3b1b260bd61b34..ec2e6d52d247fbcc9f07c54518f860d1
  interface CertVerifierClient {
    Verify(
      int32 default_error,
-@@ -603,6 +622,8 @@ struct URLLoaderFactoryParams {
+@@ -608,6 +627,8 @@ struct URLLoaderFactoryParams {
    // interface. This still respects the per-context block lists.
    CorsOriginAccessPatterns? factory_bound_access_patterns;
 

patches/chromium/blink_local_frame.patch

@@ -14,10 +14,10 @@ when there is code doing that.
 This patch reverts the change to fix the crash in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 13a7940a11028d7800787a9d4ed1651483bf22a1..ee4b9bb290611b3f3d7c9b2553960e2517a3bf96 100644
+index 7c54c247c60ab316ee7759295d0a1a2b4d6b1d88..75a92b159ef3e252e895cd9b649217cdc5662ead 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -353,10 +353,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -357,10 +357,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    }
    CHECK(!view_ || !view_->IsAttached());
 
@@ -28,7 +28,7 @@ index 13a7940a11028d7800787a9d4ed1651483bf22a1..ee4b9bb290611b3f3d7c9b2553960e25
    if (!Client())
      return;
 
-@@ -374,6 +370,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -378,6 +374,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
    // Notify ScriptController that the frame is closing, since its cleanup ends
    // up calling back to LocalFrameClient via WindowProxy.
    GetScriptController().ClearForClose();

patches/chromium/blink_world_context.patch

@@ -7,10 +7,10 @@ This exposes a method for obtaining a reference to an isolated world, which is
 otherwise not available in the Blink API.
 
 diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
-index 0faffef486ac186fe4ce74921ed5b96a62b23937..d6c29028aab0847aca98e0d2294f9a4941cf632b 100644
+index 719ac964585e9ffdf412cc53e73e6b819532a618..acf4f0f317bc5e65d2f0c7b0454103ed86429778 100644
 --- a/third_party/blink/public/web/web_local_frame.h
 +++ b/third_party/blink/public/web/web_local_frame.h
-@@ -356,6 +356,9 @@ class WebLocalFrame : public WebFrame {
+@@ -338,6 +338,9 @@ class WebLocalFrame : public WebFrame {
    // be calling this API.
    virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
 
@@ -21,10 +21,10 @@ index 0faffef486ac186fe4ce74921ed5b96a62b23937..d6c29028aab0847aca98e0d2294f9a49
    // that the script evaluated to with callback. Script execution can be
    // suspend.
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-index b425add4fae51f816b113eec1b604ab719cb4949..789c9a27167428aec98ac340e2d76c6be8a556b9 100644
+index f2f0d907a72ef1ffa3eb6e90f0d68c7b31417de9..082c3cbfb789635839443b553986e50c80de533c 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-@@ -955,6 +955,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
+@@ -942,6 +942,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
    return MainWorldScriptContext()->Global();
  }
 
@@ -39,10 +39,10 @@ index b425add4fae51f816b113eec1b604ab719cb4949..789c9a27167428aec98ac340e2d76c6b
    return BindingSecurity::ShouldAllowAccessToFrame(
        CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-index 62b69c655de4337c691c880ddd0c63f9e9af5626..82baab83ec73089688ad3bb24c3a42e106fe4cf3 100644
+index b10079489c1529df22f7087151e25e6541b2ac9c..129aa8a7db35b36bf4e8bc2d7a0fd87427355115 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-@@ -173,6 +173,8 @@ class CORE_EXPORT WebLocalFrameImpl final
+@@ -168,6 +168,8 @@ class CORE_EXPORT WebLocalFrameImpl final
        int argc,
        v8::Local<v8::Value> argv[]) override;
    v8::Local<v8::Context> MainWorldScriptContext() const override;

patches/chromium/build_add_electron_tracing_category.patch

@@ -8,10 +8,10 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 5c8844f699506362c21e7eb4b3ca5e869684c5bb..0884cd263f5f5e793932800bdbb50d6e33955ed0 100644
+index bf408c6bff28f05b91dae284565e6f4ecf2b03d1..6bbf011aad1a6fc20ea5c3f0adee9e6b2f11d707 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -66,6 +66,7 @@
+@@ -67,6 +67,7 @@
    X("dwrite")                                                            \
    X("DXVA Decoding")                                                     \
    X("EarlyJava")                                                         \

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/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-index 612d83aaa8ec820e5640effab5b96aa37b3205ea..83dbc5037810469e76895e01cc1c3ff0399b0420 100644
+index 59107c7284d76d6d448caed9b5b23a9eb43a18a7..be4896118a93addcc0af5ee4eb07e27447f50cb6 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -4411,6 +4411,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -4462,6 +4462,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,
@@ -21,7 +21,7 @@ index 612d83aaa8ec820e5640effab5b96aa37b3205ea..83dbc5037810469e76895e01cc1c3ff0
            &no_javascript_access);
 
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index dce2284977bf3d8fba00e6488d51fd6bfa1cb3b0..afeebca6b6fd01294acbf62aa6a7eaf43151b9e6 100644
+index abd2be4bc8e81a28209aa551f4435b9e8d37a249..f33766c98e1a28c89fc41f9e5cfd098ca6bc6150 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
 @@ -305,6 +305,10 @@ struct CreateNewWindowParams {
@@ -36,7 +36,7 @@ index dce2284977bf3d8fba00e6488d51fd6bfa1cb3b0..afeebca6b6fd01294acbf62aa6a7eaf4
 
  // 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 a6042e5b21c77b27a3df77db3da321943f4c190d..38409b9d1ce06c2a73ce2feb98a6be35325ca472 100644
+index bcdc73fdf89d46e267f0c9568e46172ec89f9f23..930e043a0fdf40ef0e48a19597da567c8603878c 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
 @@ -505,6 +505,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -49,7 +49,7 @@ index a6042e5b21c77b27a3df77db3da321943f4c190d..38409b9d1ce06c2a73ce2feb98a6be35
      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 8256cd888b4c2af893fb98c3f5c77641eaa6c70b..af7c11bfbb26894ba4eb97b3fcbb026af288c084 100644
+index 5807d1d7d6021e045b2b3c6d4e2e4106e118ab3b..7abfa455bce8b8a4d7ba9d3e3c5aab4477dceaa2 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -145,6 +145,7 @@ class NetworkService;
@@ -70,7 +70,7 @@ index 8256cd888b4c2af893fb98c3f5c77641eaa6c70b..af7c11bfbb26894ba4eb97b3fcbb026a
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 596e71dee6b6591f96d1e772e167577c24aa87f8..6820d5aabc8dfcb01e8a10b7b3fe94a35b3468a6 100644
+index 8b6362f566c215552e5eaba06cbbac31c6ab792d..272f0ed4ffada8191e725f31c8533bcb35622e46 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -69,6 +69,7 @@
@@ -81,7 +81,7 @@ index 596e71dee6b6591f96d1e772e167577c24aa87f8..6820d5aabc8dfcb01e8a10b7b3fe94a3
  #include "content/renderer/media/audio/audio_device_factory.h"
  #include "content/renderer/render_frame_impl.h"
  #include "content/renderer/render_frame_proxy.h"
-@@ -1278,6 +1279,8 @@ WebView* RenderViewImpl::CreateView(
+@@ -1276,6 +1277,8 @@ WebView* RenderViewImpl::CreateView(
    }
    params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
 
@@ -91,10 +91,10 @@ index 596e71dee6b6591f96d1e772e167577c24aa87f8..6820d5aabc8dfcb01e8a10b7b3fe94a3
    // moved on send.
    bool is_background_tab =
 diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc
-index 62ae14ae5562cb6c94d106b92f6b422b02d63b3c..fed91002d1998ec20449d07c2ca98f75fe190dda 100644
+index 4497b2d0c264f3e8ebc05230bdc117b6abccc23b..2eaa105035208d92cdcfe0e4de2a62ebbce1414b 100644
 --- a/content/shell/browser/web_test/web_test_content_browser_client.cc
 +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
-@@ -322,6 +322,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -326,6 +326,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,

patches/chromium/dcheck.patch

@@ -17,7 +17,7 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
 diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
-index 1d417ce9405fd65b17137c01468d99eba7fa0e76..1f893cbbc248ac34b4f28d58e5cf9a20ddf29b7a 100644
+index 1bb7007c16029db901514e79171952d07b47058e..5f5e887f85abc5c4f948de034feb4482571144fc 100644
 --- a/content/browser/frame_host/navigation_controller_impl.cc
 +++ b/content/browser/frame_host/navigation_controller_impl.cc
 @@ -1250,8 +1250,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
@@ -46,10 +46,10 @@ index 1d417ce9405fd65b17137c01468d99eba7fa0e76..1f893cbbc248ac34b4f28d58e5cf9a20
    // navigation. Now we know that the renderer has updated its state accordingly
    // and it is safe to also clear the browser side history.
 diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
-index ac1e34f5ee216360a8899ec9c8c047eaa06470ac..5581b2fc813fcb48798f19fa67e14e4b71235f75 100644
+index 1308bcb042b38d502b1b65b04affabf7e09d6fcd..52c9da3ea565d131ea8704f34f743f6661d42e84 100644
 --- a/ui/base/clipboard/clipboard_win.cc
 +++ b/ui/base/clipboard/clipboard_win.cc
-@@ -743,10 +743,10 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
+@@ -768,10 +768,10 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
  }
 
  void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {

patches/chromium/disable-redraw-lock.patch

@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index c985bf35795211266e95364447e5462b63a4e657..1afa1b4bdb04b0c0a41b9198310b03fb77cb72bf 100644
+index 5bfd124520083b72287a69d6dd8b450067021a15..3245b3a09df4e97331ddee77395274477af04a78 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -304,6 +304,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -37,7 +37,7 @@ index c985bf35795211266e95364447e5462b63a4e657..1afa1b4bdb04b0c0a41b9198310b03fb
                       (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                        !ui::win::IsAeroGlassEnabled())) {
      if (should_lock_)
-@@ -971,6 +976,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
+@@ -969,6 +974,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
    return scoped_enable;
  }
 
@@ -49,7 +49,7 @@ index c985bf35795211266e95364447e5462b63a4e657..1afa1b4bdb04b0c0a41b9198310b03fb
  // HWNDMessageHandler, gfx::WindowImpl overrides:
 
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index 276fc61b1ae98021a53d4cc2c23b708bdb6633f7..c717121d220ce993d9a984af6124375f0398ba2f 100644
+index 12f449fd097662a49a7bd4a7fce0cbd4f9cead58..0de89fe8f856143b76682c1d5455d5f990930aab 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
 @@ -203,6 +203,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,