chore: bump chromium to 4b6692e4cc2839729bb7ac009586a (master) (#21864)
* chore: bump chromium in DEPS to a1ea0d7aedd6b5fe58fbabfa3b05aa8ee41304ff * update patches * update extensions code * Remove WebPoint2007474
* fix build * chore: bump chromium in DEPS to 9351e26c2a3714f8bbb10789c71bb51b0b494c75 * update patches * Remove error description from the DidFailLoadWithError message2011280
* Make SimpleNetworkHintsHandlerImpl use the right NetworkIsolationKey1994430
* Rename libgtkui to gtk2011683
* [metrics] Remove histogram Startup.WarmStartTimeFromRemoteProcessStart*.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>
This commit is contained in:
parent
0bd8a97f38
commit
2b53788c35
55 changed files with 260 additions and 231 deletions
|
@ -40,7 +40,7 @@ index d72a867594acee97d50c5f905fc1a4df9aa9352e..8a4cc159cb490ebadbb1b54aa88223c0
|
|||
+ return PP_OK;
|
||||
}
|
||||
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
|
||||
index 6d40a6b79d027df09412db2f5e3d573bc176cb31..03eb786787cdd349b33c2512ea32ceaceede9291 100644
|
||||
index c1fdd9dd86e4a205c6e2b51910f2bd2901501c75..77d65652808f2405881a8e1bb53d70d020866781 100644
|
||||
--- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
|
||||
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
|
||||
@@ -8,9 +8,11 @@
|
||||
|
@ -90,8 +90,8 @@ index 6d40a6b79d027df09412db2f5e3d573bc176cb31..03eb786787cdd349b33c2512ea32ceac
|
|||
// belong to the profile which lives on the UI thread. We lazily initialize
|
||||
// |cookie_settings_| by grabbing the reference from the UI thread and then
|
||||
@@ -140,9 +147,11 @@ int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
|
||||
context->MakeReplyMessageContext(), document_url,
|
||||
plugin_url));
|
||||
context->MakeReplyMessageContext(), document_url,
|
||||
plugin_url));
|
||||
}
|
||||
- return PP_OK_COMPLETIONPENDING;
|
||||
+#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue