Skip to content
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

Upgrade patches from Chromium 77.0.3865.90 to Chromium 78.0.3904.44 #3600

Closed
wants to merge 70 commits into from

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Oct 3, 2019

Fixes brave/brave-browser#6067
Related PR brave/brave-browser#6311

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
  • Verify test plan is specified in PR before merging to source

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.

browser/net/url_context.cc Outdated Show resolved Hide resolved
@mkarolin mkarolin changed the title Upgrade patches from Chromium 77.0.3865.75 to Chromium 78.0.3904.44 Upgrade patches from Chromium 77.0.3865.90 to Chromium 78.0.3904.44 Oct 4, 2019
@mkarolin mkarolin force-pushed the 78.0.3904.44 branch 7 times, most recently from 2e47079 to 845518a Compare October 7, 2019 21:51
@mkarolin mkarolin changed the title Upgrade patches from Chromium 77.0.3865.90 to Chromium 78.0.3904.44 WIP: Upgrade patches from Chromium 77.0.3865.90 to Chromium 78.0.3904.44 Oct 8, 2019
@mkarolin mkarolin marked this pull request as ready for review October 8, 2019 16:27
Chromium change:

https://chromium.googlesource.com/chromium/src/+/5e32b68410004c00a852edddad7f7c5183defbd1

commit 5e32b68410004c00a852edddad7f7c5183defbd1
Author: Thomas Tangl <tangltom@chromium.org>
Date:   Tue Aug 13 11:03:30 2019 +0000

    Rename ProfileChooserView to ProfileMenuView

    Bug: 966388
ButtonPressed override in ProfileMenuViewBase has been marked `final`,
we don't need to override it any more. Also, Reset was moved to the
base, we don't need to override it either.

Chromium changes:

https://chromium.googlesource.com/chromium/src/+/7cbff633bb1691549909f3bc85a627a465de7a82

commit 7cbff633bb1691549909f3bc85a627a465de7a82
Author: Thomas Tangl <tangltom@chromium.org>
Date:   Wed Aug 14 17:44:17 2019 +0000

    [profile-menu] Move button handling to ProfileMenuViewBase

    - The logic of the button actions remains in ProfileMenuView.
    - The button handling is done in ProfileMenuViewBase.

    Bug: 966388

https://chromium.googlesource.com/chromium/src/+/5d41b7ef83207bf7c01eb53c5378760a7bbc7042

commit 5d41b7ef83207bf7c01eb53c5378760a7bbc7042
Author: Thomas Tangl <tangltom@chromium.org>
Date:   Wed Aug 21 09:50:44 2019 +0000

    [profile-menu] Move bubble creation to ProfileMenuViewBase

    Bug: 966388
Chromium change:

https://chromium.googlesource.com/chromium/src/+/fd4db3db83c7564f55679d9700a6f2e6641e3b13

commit fd4db3db83c7564f55679d9700a6f2e6641e3b13
Author: Clark DuVall <cduvall@chromium.org>
Date:   Tue Jul 30 19:10:43 2019 +0000

    Remove all references to UIThreadExtensionFunction

    UIThreadExtensionFunction was merged into ExtensionFunction in
    http://crrev.com/c/1718990. This removes the stub
    UIThreadExtensionFunction class and renames all the references from
    UIThreadExtensionFunction to ExtensionFunction.

    This CL was generated with the command:
      git grep --name-only UIThreadExtensionFunction | \
        xargs sed -i 's/UIThreadExtensionFunction/ExtensionFunction/g'

    Bug: 980774
Chromium change:

https://chromium.googlesource.com/chromium/src/+/eadf58863bcf6a3365841ef88c6ed686c2ba3485

commit eadf58863bcf6a3365841ef88c6ed686c2ba3485
Author: Gabriel Charette <gab@chromium.org>
Date:   Thu Aug 29 05:20:27 2019 +0000

    [ThreadPool] Move thread_pool.h to thread_pool_instance.h

    The only class defined in this header is ThreadPoolInstance and this
    is thus more correct.
To avoid compilation error:

In file included from ../../brave/components/omnibox/browser/topsites_provider.cc:6:
In file included from ../..\brave/components/omnibox/browser/topsites_provider.h:13:
In file included from ../..\components/omnibox/browser/autocomplete_match.h:23:
In file included from ../..\components/url_formatter/url_formatter.h:28:
In file included from ../..\components/url_formatter/spoof_checks/idn_spoof_checker.h:17:
../..\third_party/icu/source/common/unicode/uniset.h(16,10): fatal error: 'unicode/ucpmap.h' file not found
\#include "unicode/ucpmap.h"
         ^~~~~~~~~~~~~~~~~~
Chromium change:

https://chromium.googlesource.com/chromium/src/+/92bf36029638ae236920177e722650bed2a40e84

commit 92bf36029638ae236920177e722650bed2a40e84
Author: John Abd-El-Malek <jam@chromium.org>
Date:   Wed Jul 31 02:25:48 2019 +0000

    Move ResourceRequestInfo::WebContentsGetter to WebContents::Getter.

    This is in preparation of removing ResourceRequestInfo which isn't needed anymore.

    Bug: 934009
Note, that ResourceRequestInfo::WebContentsGetter has been moved to
WebContents::Getter in a separate commit.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/346c99158a1ea8b52d4837dac679693289e5a308

commit 346c99158a1ea8b52d4837dac679693289e5a308
Author: John Abd-El-Malek <jam@chromium.org>
Date:   Wed Jul 31 20:48:58 2019 +0000

    Remove ResourceRequestInfo.

    Bug: 934009
tmancey
tmancey previously approved these changes Oct 8, 2019
Copy link
Collaborator

@tmancey tmancey left a comment

Choose a reason for hiding this comment

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

Ads changes LGTM++

Chromium change:

https://chromium.googlesource.com/chromium/src/+/9f06bf9c6072720ef3dbec5c06ba0b859dee6a8e

commit 9f06bf9c6072720ef3dbec5c06ba0b859dee6a8e
Author: Robert Liao <robliao@chromium.org>
Date:   Mon Aug 12 19:33:55 2019 +0000

    Add GetCreationTime() function to profile, which returns the date/time the user profile was created.

    This is needed for use in the trigger checks for HaTS.

    Bug: 807714
@bsclifton
Copy link
Member

Awesome job @mkarolin! Looks like the only thing left is solving the network audit (which is why this shows as red; everything else passed perfectly). @jumde should be able to help with that

And then @iefremov will have a follow up (after this) for brave/brave-browser#6313, removing some of the commented out code / obsolete code paths

// if (request_info) {
// ctx->resource_type = request_info->GetResourceType();
// if (auto* context = request_info->GetContext()) {
// ctx->is_webtorrent_disabled = IsWebTorrentDisabled(context);
Copy link
Contributor

Choose a reason for hiding this comment

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

some tests should fail, right? I hope I'll be able to quickly jump in with the fix.

Copy link
Member

Choose a reason for hiding this comment

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

all tests passed on the last run

Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure if this is good for us :D

@iefremov iefremov self-requested a review October 9, 2019 05:58
@iefremov
Copy link
Contributor

iefremov commented Oct 9, 2019

LGTM

@mkarolin mkarolin requested a review from emerick October 9, 2019 17:29
@bsclifton
Copy link
Member

Created brave/brave-browser#6385 to cover the hover card behavior (good catch, @jumde!)

@bsclifton bsclifton changed the title WIP: Upgrade patches from Chromium 77.0.3865.90 to Chromium 78.0.3904.44 Upgrade patches from Chromium 77.0.3865.90 to Chromium 78.0.3904.44 Oct 9, 2019
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.

Just finished reviewing - left some comments 😄 Other than those, everything looks great! 👍

@iefremov
Copy link
Contributor

JFYI, PR that cleans up conflicting code #3645

@mkarolin
Copy link
Collaborator Author

Closing in favor of #3653

@mkarolin mkarolin closed this Oct 10, 2019
@bsclifton bsclifton deleted the 78.0.3904.44 branch October 10, 2019 16:12
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.

Upgrade from Chromium 77.0.3865.90 to Chromium 78.0.3904.50
5 participants