Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10 #395

bbondy · 2018-09-04T20:44:26Z

Fix brave/brave-browser#952
Fix brave/brave-browser#979

Submitter Checklist:

Submitted a ticket for my issue if one did not already exist.
Used Github auto-closing keywords in the commit message.
Added/updated tests for this change (for new code or code which already has tests).
Ran git rebase -i to squash commits (if needed).
Tagged reviewers and labelled the pull request as needed.
Request a security/privacy review as needed.
Add appropriate QA labels (QA/Needed or QA/No-QA-Needed) to include the closed issue in milestone

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

bbondy · 2018-09-04T20:52:43Z

patches/services-network-tcp_connected_socket.cc.patch

@@ -1,22 +0,0 @@
-diff --git a/services/network/tcp_connected_socket.cc b/services/network/tcp_connected_socket.cc
-index d8d6a1cd98c81268ab4fb597f682d71664317134..335859f434e3b7822ab483577a25a7da5586b8ec 100644
--- a/services/network/tcp_connected_socket.cc


Chromium upstream already has this code exactly now.

yep, that's expected. cc @yrliou

bridiver · 2018-09-04T21:30:19Z

patches/chrome-browser-extensions-chrome_extensions_browser_client.cc.patch

+ ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {
+   AddAPIProvider(std::make_unique<CoreExtensionsBrowserAPIProvider>());
+   AddAPIProvider(std::make_unique<ChromeExtensionsBrowserAPIProvider>());
+  AddAPIProvider(std::make_unique<BraveExtensionsBrowserAPIProvider>());


we should probably follow-up with a chromium_src override and subclass ChromeExtensionsBrowserAPIProvider to get rid of this patch and possibly the dups patch by merging and de-duping inside the provider

bridiver · 2018-09-04T21:31:12Z

patches/chrome-browser-importer-importer_list.cc.patch

- #include "base/task/task_traits.h"
- #include "base/threading/thread_restrictions.h"
-+#include "base/values.h"
-+#include "brave/common/importer/brave_importer_utils.h"


is this right? Did you move to chromium_src or are these no longer needed for COOKIES?

bridiver · 2018-09-04T21:32:07Z

patches/chrome-common-extensions-chrome_extensions_client.cc.patch


-   return api::GeneratedSchemas::Get(name);
+ ChromeExtensionsClient::ChromeExtensionsClient() {
+  AddAPIProvider(std::make_unique<BraveExtensionsAPIProvider>());


same as above with provider subclass

bridiver · 2018-09-04T21:33:51Z

common/BUILD.gn

    "//brave/chromium_src:common",
  ]

+  public_deps = [
+    "extensions/api",


why a public dep now?

bridiver · 2018-09-04T21:34:39Z

common/extensions/brave_extensions_api_provider.cc

+
+namespace extensions {
+
+BraveExtensionsAPIProvider::BraveExtensionsAPIProvider() {}


this is going to be really helpful for adding our own extension apis

bridiver · 2018-09-04T21:35:55Z

chromium_src/chrome/browser/importer/importer_list.cc

@@ -41,8 +42,8 @@ void AddChromeToProfiles(std::vector<importer::SourceProfile>* profiles,
 }

 void DetectChromeProfiles(std::vector<importer::SourceProfile>* profiles) {
-  base::AssertBlockingAllowed();
-
+  base::ScopedBlockingCall scoped_blocking_call(


unrelated to this update, is this running on the wrong thread?

I think there's a counter issue to remove it.

bridiver · 2018-09-04T21:37:30Z

components/brave_shields/browser/https_everywhere_service.cc

@@ -146,7 +146,8 @@ bool HTTPSEverywhereService::GetHTTPSURL(
    const GURL* url, const uint64_t& request_identifier,
    std::string& new_url) {
  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  base::AssertBlockingAllowed();
+  base::ScopedBlockingCall scoped_blocking_call(


same thing here with the thread. Not a problem with this PR, but I didn't have to do this for rewards leveldb stuff

because this is a change in the 70 upgrade. I'll have to do this when I rebase on top of rewards.

bridiver · 2018-09-04T21:40:01Z

chromium_src/components/crash/content/app/crashpad_linux.cc

@@ -16,6 +16,13 @@ class BraveCrashpadClient {
                           const std::string& url,
                           const std::map<std::string, std::string>& annotations,
                           const std::vector<std::string>& arguments);
+  static bool StartHandlerForClient(const base::FilePath& handler,


cc @emerick to review this commit

Otherwise the re-used bindings will use the wrong ones

Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10

bbondy · 2018-09-09T20:33:45Z

0.55.x 2bd1171

Overwrite chrome/app/theme/chromium resources with ours

bbondy self-assigned this Sep 4, 2018

bbondy requested a review from bridiver September 4, 2018 20:44

bbondy commented Sep 4, 2018

View reviewed changes

bridiver reviewed Sep 4, 2018

View reviewed changes

common/BUILD.gn

"//brave/chromium_src:common",

]

public_deps = [

"extensions/api",

Copy link

Collaborator

bridiver Sep 4, 2018

Choose a reason for hiding this comment

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

why a public dep now?

bridiver reviewed Sep 4, 2018

View reviewed changes

bridiver previously approved these changes Sep 4, 2018

View reviewed changes

bbondy dismissed bridiver’s stale review via 08c48dd September 4, 2018 22:13

bbondy force-pushed the 70.0.3538.6 branch 11 times, most recently from 69dc17d to 92f3140 Compare September 5, 2018 20:18

bbondy changed the title ~~Upgrade from Chromium 70.0.3528.4 to 70.0.3538.6~~ Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10 Sep 6, 2018

bbondy force-pushed the 70.0.3538.6 branch from 92f3140 to 87b711b Compare September 6, 2018 21:19

bbondy added the pr/work-in-progress label Sep 8, 2018

bbondy changed the title ~~Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10~~ WIP: Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10 Sep 8, 2018

bbondy force-pushed the 70.0.3538.6 branch 2 times, most recently from 2f2e505 to 4b645d7 Compare September 9, 2018 15:03

bbondy force-pushed the 70.0.3538.6 branch from 4b645d7 to 7248994 Compare September 9, 2018 15:10

bbondy changed the title ~~WIP: Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10~~ Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10 Sep 9, 2018

bbondy removed the pr/work-in-progress label Sep 9, 2018

bbondy added 8 commits September 9, 2018 16:30

Upgrade patches from 70.0.3538.4 -> 70.0.3538.12

d2b2761

Move Brave API registration to own providers

83375d9

Update GRD files for C70.0.3538.12

1852255

Update XTB files for 70.0.3538.12

5f07fd0

Various changes for 70.0.3538.12

efe72f5

Add unresolved BraveCrashpadClient::StartHandlerForClient

d8bd2b6

Add safe browsing constant to install_modes

94e143f

Add BraveExtensionsAPIProvider last

150433c

Otherwise the re-used bindings will use the wrong ones

bbondy force-pushed the 70.0.3538.6 branch from 7248994 to 150433c Compare September 9, 2018 20:30

bbondy merged commit bd7bc1f into master Sep 9, 2018

bbondy added a commit that referenced this pull request Sep 9, 2018

Merge pull request #395 from brave/70.0.3538.6

2bd1171

Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10

bbondy added the 0.55.x label Sep 9, 2018

bsclifton deleted the 70.0.3538.6 branch September 26, 2018 05:44

bbondy added this to the 0.55.x - Release milestone Jan 14, 2019

fmarier pushed a commit that referenced this pull request Oct 29, 2019

Merge pull request #395 from brave/overwrite_chromium_image_resources

7f9f449

Overwrite chrome/app/theme/chromium resources with ours

petemill pushed a commit that referenced this pull request Jul 27, 2020

Merge pull request #395 from brave/overwrite_chromium_image_resources

dd8a2e7

Overwrite chrome/app/theme/chromium resources with ours

petemill pushed a commit that referenced this pull request Jul 28, 2020

Merge pull request #395 from brave/overwrite_chromium_image_resources

5b460bf

Overwrite chrome/app/theme/chromium resources with ours

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10 #395

Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10 #395

Uh oh!

bbondy commented Sep 4, 2018 •

edited

Loading

Uh oh!

bbondy Sep 4, 2018

Uh oh!

bridiver Sep 4, 2018

Uh oh!

bridiver Sep 4, 2018

Uh oh!

bridiver Sep 4, 2018

Uh oh!

bridiver Sep 4, 2018

Uh oh!

bridiver Sep 4, 2018

Uh oh!

bridiver Sep 4, 2018

Uh oh!

bridiver Sep 4, 2018

Uh oh!

bbondy Sep 4, 2018

Uh oh!

bridiver Sep 4, 2018

Uh oh!

bbondy Sep 4, 2018

Uh oh!

bridiver Sep 4, 2018

Uh oh!

emerick Sep 4, 2018

Uh oh!

bbondy commented Sep 9, 2018

Uh oh!

Uh oh!


		namespace extensions {

		BraveExtensionsAPIProvider::BraveExtensionsAPIProvider() {}

Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10 #395

Upgrade from Chromium 70.0.3528.4 to 70.0.3538.10 #395

Uh oh!

Conversation

bbondy commented Sep 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Submitter Checklist:

Test Plan:

Reviewer Checklist:

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bbondy commented Sep 9, 2018

Uh oh!

Uh oh!

bbondy commented Sep 4, 2018 •

edited

Loading