Skip to content

Upgrade from Chromium 85.0.4183.102 to Chromium 85.0.4183.121 #11797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2020

Conversation

mkarolin
Copy link
Contributor

@mkarolin mkarolin commented Sep 21, 2020

Fixes #11793
Related PR: brave/brave-core#6675

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions.

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++

@kjozwiak
Copy link
Member

test-browser failed on Win x64 due to GreaselionServiceTest.ScriptInjectionWithPrecondition failing which is a known intermittent issue and doesn't block uplift.

18:10:50  [  FAILED  ] GreaselionServiceTest.ScriptInjectionWithPrecondition, where TypeParam =  and GetParam() =  (2855 ms)
18:10:50  
18:10:50  [605/605] GreaselionServiceTest.ScriptInjectionWithPrecondition (3054 ms)
18:10:50  1 test failed:
18:10:50      GreaselionServiceTest.ScriptInjectionWithPrecondition (../../brave/browser/greaselion/greaselion_browsertest.cc:265)
18:10:50  null

@kjozwiak kjozwiak requested a review from a team September 23, 2020 04:32
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.14.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 40a3472 into 1.14.x Sep 23, 2020
@kjozwiak kjozwiak deleted the 85.0.4183.121_1.14.x_59 branch September 23, 2020 04:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants