chore: bump chromium to 134.0.6998.10 (35-x-y) (#45585)
* chore: bump chromium to 134.0.6992.0 Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: add BrowserProcessImpl::CreateGlobalFeaturesForTesting() stub Xref:6216193
Remove GlobalFeatures from TestingBrowserProcess::Init Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: bump chromium to 134.0.6994.0 Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6208630: Mac sandbox: don't use protobuf for policy serialization |6208630
Co-authored-by: alice <alice@makenotion.com> * Remove HasUnsupportedFeature Mojo interface Xref:6220800
Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6217444: Remove scoped_gdi_object.h type aliases. |6217444
Co-authored-by: alice <alice@makenotion.com> * chore: bump chromium to 134.0.6998.10 Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6221378: Revert [OBC] Exclude Aliasing Cookies in FilterCookiesWithOptions() |6221378
Co-authored-by: alice <alice@makenotion.com> * Update ExtensionPrefs::GetDisableReasons to return DisableReasonSet Xref:6218840
change copied from 6218840 extensions/shell/browser/shell_extension_loader.cc Co-authored-by: Charles Kerr <charles@charleskerr.com> * 6218402: Typemap ui.gfx.DXGIHandle <=> gfx::DXGIHandle |6218402
Co-authored-by: alice <alice@makenotion.com> * chore: disable flaky contentTracing test not new to this roll; it is happening in main as well Co-authored-by: Charles Kerr <charles@charleskerr.com> * fixup! chore: disable flaky contentTracing test Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update patches * chore: disable flaky content tracing tests on Linux (#45612) (cherry picked from commita1e4550c9e
) --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: alice <alice@makenotion.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
parent
74c71dbb2d
commit
c92a02ea17
71 changed files with 246 additions and 272 deletions
|
@ -133,10 +133,10 @@ index 05d3a12dd84c7005d46cc73b312f97ef418d96f5..4765de982802541b3efc7211d106acc7
|
|||
const GURL& document_url,
|
||||
const WeakDocumentPtr& weak_document_ptr,
|
||||
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
index 9feaa88b28a0bf826813510524039cf21c89e0f5..160607287f4c780a7729c7e38c97bcdcd70751cc 100644
|
||||
index e49a7ccae6e07c60f2c3da927d6abc12d25f50ba..6e5a1fa6af3e0f4d3e9116088bdec5a31f59b29a 100644
|
||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -2152,7 +2152,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
||||
@@ -2154,7 +2154,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
||||
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
|
||||
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
|
||||
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
||||
|
@ -145,7 +145,7 @@ index 9feaa88b28a0bf826813510524039cf21c89e0f5..160607287f4c780a7729c7e38c97bcdc
|
|||
creator_type, std::move(receiver));
|
||||
break;
|
||||
}
|
||||
@@ -2160,7 +2160,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
||||
@@ -2162,7 +2162,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
||||
CHECK(rfh);
|
||||
|
||||
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue