Skip to content

CONFLICTED Cherry pick commit 224f85c85fb99682855219a3d450fedc3d1a465e: Update to 142.7430. - #12467

Open
cobalt-github-releaser-bot wants to merge 11 commits into
stagingfrom
autoroll-chromium/main-to-staging
Open

CONFLICTED Cherry pick commit 224f85c85fb99682855219a3d450fedc3d1a465e: Update to 142.7430.#12467
cobalt-github-releaser-bot wants to merge 11 commits into
stagingfrom
autoroll-chromium/main-to-staging

Conversation

@cobalt-github-releaser-bot

@cobalt-github-releaser-bot cobalt-github-releaser-bot commented Sep 4, 2026

Copy link
Copy Markdown
Collaborator

Automated cherry-pick roll to staging.

Original pull requests:

CONFLICTED files:

DEPS
base/allocator/partition_allocator/partition_alloc.gni
build/config/android/config.gni
chrome/browser/permissions/BUILD.gn
components/update_client/url_fetcher_downloader.cc
components/viz/common/features.cc
content/browser/renderer_host/media/media_stream_dispatcher_host.cc
content/browser/renderer_host/render_widget_host_view_tvos_uiview.mm
gpu/ipc/service/gpu_channel_manager.h
services/network/url_loader.cc
third_party/blink/renderer/core/frame/build.gni
third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h
third_party/blink/web_tests/TestExpectations

To merge these changes, run the autoroll script:

GITHUB_REPOSITORY=youtube/cobalt python3 cobalt/devinfra/github/autoroll/merge_autoroll.py \
  --source-branch chromium/main \
  --target-branch staging

⚠️ This PR has conflicts that must be resolved manually (don't forget to update the .github/AUTOROLL_CHROMIUM file). Use the following commands to checkout the branch locally and resolve the conflicts in a separate commit:

gh pr checkout <pull_request_number> -R youtube/cobalt

# Resolve conflicts and update .github/AUTOROLL_CHROMIUM then
git add <resolved_files>

# Copy CONFLICTED commit's message and metadata
# Replace CONFLICTED in title with RESOLVED
git commit -c <conflicted_sha>

git push origin autoroll-chromium/main-to-staging

Bug: 556572231

Update to commit 68fde4e8e66260dc69f03febac965d9bdc713ccb
Refer to original commit: 2e0e91b

Update to commit 68fde4e8e66260dc69f03febac965d9bdc713ccb

(cherry picked from commit 2e0e91b)
Bug: 555517987

---------

Co-authored-by: Chris Yuming Chang <chrisymchang@igalia.com>
Co-authored-by: Abhijeet Kandalkar <abhijeet@igalia.com>
Update to commit 59ea40112c8d4cf4b88052eacb58e750b11ddc1a
Refer to original commit: 224f85c

Update to commit 59ea40112c8d4cf4b88052eacb58e750b11ddc1a

(cherry picked from commit 224f85c)

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces extensive updates across the repository, including the addition of new prompt evaluation and testing tools under the agents/ directory, updates to android_webview and ash components, and various dependency rolls in the DEPS file. However, critical issues were identified in the DEPS file, which contains unresolved merge conflict markers that must be addressed before merging.

Comment thread DEPS
Comment thread DEPS
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants