Upgrade Chromium from 70.0.3538.67 to 71.0.3578.20 #744

bbondy · 2018-10-26T13:17:48Z

Fix brave/brave-browser#1753
Fix brave/brave-browser#1287

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

bbondy · 2018-10-30T01:43:45Z

There were some cookie failures so I added a network delegate handler for reading and writing cookies to fix it.

bbondy · 2018-10-30T01:43:55Z

This is most easily reviewed per commit. All unit and browser tests fully pass.

bbondy · 2018-10-30T01:44:32Z

app/brave_main_delegate.cc

@@ -120,7 +120,6 @@ void BraveMainDelegate::PreSandboxStartup() {
 bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
  base::CommandLine& command_line =
      *base::CommandLine::ForCurrentProcess();
-  command_line.AppendSwitch(switches::kEnableTabAudioMuting);


This doesn't exist anymore.

bbondy · 2018-10-30T01:45:32Z

browser/extensions/BUILD.gn

@@ -28,8 +28,6 @@ source_set("extensions") {
    "brave_extension_service.h",
    "brave_tor_client_updater.cc",
    "brave_tor_client_updater.h",
-    "brave_webstore_inline_installer.cc",


inline installer no longer exists.

bbondy · 2018-10-30T01:46:00Z

browser/extensions/brave_extension_install_prompt.cc

@@ -20,7 +20,7 @@ BravePrompt::~BravePrompt() {
 base::string16 BravePrompt::GetDialogTitle() const {
  if (!extensions::BraveExtensionProvider::IsVetted(extension())) {
    if (type_ == ExtensionInstallPrompt::INSTALL_PROMPT ||
-        type_ == ExtensionInstallPrompt::INLINE_INSTALL_PROMPT) {
+        type_ == ExtensionInstallPrompt::WEBSTORE_WIDGET_PROMPT) {


INLINE_INSTALL_PROMPT doesn't exist, searching history log, their refs change to WEBSOTRE_WIDGET_PROMPT.

bbondy · 2018-10-30T01:47:10Z

browser/extensions/brave_extensions_browser_api_provider.cc

@@ -8,7 +8,7 @@
 #include "extensions/browser/extension_function_registry.h"

 // TOOD: I don't know why this isn't automatically linked in
-#include "gen/brave/common/extensions/api/generated_api_registration.cc"
+#include "../gen/brave/common/extensions/api/generated_api_registration.cc"


There was a compiling error with #include <version> because of a file in the root called version by having the root out path in the gen config, so I had to remove it and tweak includes like this

bbondy · 2018-10-30T01:47:30Z

browser/extensions/brave_webstore_inline_installer.cc

@@ -1,42 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public


As mentioned inline install no longer possible, so code is removed.

bbondy · 2018-10-30T01:48:21Z

browser/net/brave_network_delegate_base.cc

      base::Bind(&BraveNetworkDelegateBase::RunNextCallback,
        base::Unretained(this), request, ctx));
  return net::ERR_IO_PENDING;
 }

+bool BraveNetworkDelegateBase::OnCanGetCookies(const URLRequest& request,


As it turns out we weren't blocking all 3p cookies from the network service (even with C70). This fixes it.

bbondy · 2018-10-30T01:49:44Z

browser/ui/content_settings/brave_content_setting_image_models.cc

 #include "brave/browser/ui/content_settings/brave_autoplay_blocked_image_model.h"
+#include "third_party/widevine/cdm/buildflags.h"
+
+#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)


New build flag introduced in C71 which was causing build problems only for Linux. It's better we don't show this UI anyway on Linux since we don't have Widevine available yet there.

bbondy · 2018-10-30T01:50:51Z

build/BUILD.gn

@@ -3,7 +3,6 @@ import("//brave/build/config.gni")
 # Changing these will cause a full rebuild
 brave_include_dirs_ = [
  "//brave/chromium_src",
-  root_out_dir,


See above comment about #include <version>

bbondy · 2018-10-30T01:51:18Z

chromium_src/chrome/app/chrome_main_delegate.cc

+
+// This chormium_src override allows us to skip a lot of patching to chrome/BUILD.gn
+#include "brave/app/brave_main_delegate.cc"
+#include "../../../../chrome/app/chrome_main_delegate.cc"


I decided I was tired of rebasing that BUILD.gn file for all the brave_main_delegate.cc references.

When removing them(brave_main_delegate.[cc|h] from chrome/BUILD.gn, modifying them doesn't trigger rebuild.
If those files aren't changed frequently, how about adding some comment to those files?

~~Or how about adding them to proper BUILD.gn in brave folder?~~
Ah, chrome_main_delegate.cc should be touched when they are modifed.

I think we should solve this in a general way of touching the changed files. Problem is there is a reference of the file in 10 different places otherwise.

bbondy · 2018-10-30T01:51:54Z

chromium_src/components/content_settings/core/browser/content_settings_registry.cc

-      base::FeatureList::IsEnabled(features::kEnableEphemeralFlashPermission)
-      ? ContentSettingsInfo::EPHEMERAL
-      : ContentSettingsInfo::PERSISTENT);
+      ContentSettingsInfo::EPHEMERAL);


kEnableEphemeralFlashPermission doesn't exist now and EPHEMERAL is always assumed.

bbondy · 2018-10-30T01:52:54Z

components/brave_shields/browser/brave_shields_util.cc

    return false;
-  } else if (resource_identifier == "trackers") {
+  } else if (resource_identifier == brave_shields::kTrackers) {


Not sure why we didn't use these constants, but we should have been, so updated it.

Browser distribution string now uses IDS_ABOUT_VERSION_COMPANY_NAME See also Chromium commit: commit 31e1a2dbccc34a129ce779fea8d793b53f3ed945 Author: Greg Thompson <grt@chromium.org> Date: Wed Sep 5 11:15:44 2018 +0000 Move GetPublisherName from BrowserDistribution into InstallUtil. Chromium will now report "The Chromium Authors" rather than "Chromium" as its publisher name (as it should have all along). BUG=879568 --- Remove app_menu_controller.mm patch... Because: IsSecondaryUiMd() should always be true ShowAllDialogsWithViewsToolkit() should always be true And it doesn't exist anymore upstream. See also: commit a738bf5a7f9bb73fdcb4fff030f8b4069406c3fe Author: Robert Sesek <rsesek@chromium.org> Date: Mon Sep 24 01:28:08 2018 +0000 mac: Delete the Cocoa app menu. Bug: 832676

... and remove test reference

See in Chromium: commit 479cc17585a64910853e9949b053499ecbeca9a5 Author: Peter Kasting <pkasting@chromium.org> Date: Fri Sep 28 22:34:37 2018 +0000 Remove --enable-tab-audio-muting Per UX leads, this is dead. Bug: 752226

Per https://blog.chromium.org/2018/06/improving-extension-transparency-for.html See also: commit c4fb02304cc8ee7c6896f860f52fef72db1f069a Author: Benjamin Ackerman <ackermanb@chromium.org> Date: Wed Oct 3 19:55:41 2018 +0000 [Extensions] Obliterating the inline install API. Removing everything associated with inline installation as it is deprecated per the announcement in https://blog.chromium.org/2018/06/improving-extension-transparency-for.html

...with std <version> vs generated file version

… views)

TODO for Pete

See also: commit 8652dcd5d8f35d68f105136b3857e9b54148c31b Author: Eric Seckler <eseckler@chromium.org> Date: Thu Sep 20 10:42:28 2018 +0000 content: Replace uses of BrowserThread task posting with post_task.h API This patch updates callsites of BrowserThread task posting methods to use the post_task.h API instead. Background: We're changing the way tasks are posted to a BrowserThread, see PSA [1] and design doc [2]. This unifies the way tasks are posted and paves the way for annotating tasks with task types and other attributes that can be used to prioritize tasks in the future browser UI thread scheduler (design doc [3]). This CL changes callsites of the following forms: (a) BrowserThread::Post*Task(BrowserThread::UI/IO, ..) to base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI/IO}, ..), (b) BrowserThread::GetTaskRunnerForThread(BrowserThread::UI/IO) to base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI/IO}). It also adds necessary includes. These mechanical changes were applied by a script. Tasks posted with the same BrowserThread::ID trait (via PostTaskWithTraits or TaskRunners obtained from Create*TaskRunnerWithTraits) will still execute in the order they were posted, see [4].

To avoid new linking error by introduced build flag

--- commit 64df410d0ca79a8522d329e75ce8c21a9db77038 Author: Eric Roman <eroman@chromium.org> Date: Thu Oct 4 21:29:27 2018 +0000 Remove unused ProxyResolutionService::TryResolveProxySynchronously(). Bug: 721403 ---

Re-implements Brave's style for the New Tab Button against C71. Previously implemented against C70 in 966b6d5

Tests started to fail for cookie blockin C71, this makes it work again

Perhaps this simpler 4 line patch methodology will actually be simpler than the previous copy-and-patch method of the C70-targeted implementation de337bc#diff-d76fac9e942abff28ffedf5c3230d12d

@pilgrim-brave

Auditors: @pilgrim-brave

Upgrade Chromium from 70.0.3538.67 to 71.0.3578.20

bbondy · 2018-10-30T20:48:00Z

master: 68bbcf0
0.57.x: e1418f1

bbondy added the pr/work-in-progress label Oct 26, 2018

bbondy self-assigned this Oct 26, 2018

bbondy force-pushed the 71.0.3578.20 branch 7 times, most recently from 329cb5c to 8e76d3b Compare October 29, 2018 23:25

bbondy changed the title ~~WIP: Upgrade Chromium from 70.0.3538.67 to 71.0.3578.20~~ WIP: Upgrade Chromium from 70.0.3538.77 to 71.0.3578.20 Oct 30, 2018

bbondy added pr/work-in-progress and removed pr/work-in-progress labels Oct 30, 2018

bbondy changed the title ~~WIP: Upgrade Chromium from 70.0.3538.77 to 71.0.3578.20~~ Upgrade Chromium from 70.0.3538.67 to 71.0.3578.20 Oct 30, 2018

bbondy requested review from petemill, bridiver, darkdh and emerick October 30, 2018 01:42

bbondy commented Oct 30, 2018

View reviewed changes

bbondy and others added 18 commits October 30, 2018 14:58

Reduce patching for brave_main_deleagte.cc in chrome/BUILD.gn

df433fd

... and remove test reference

Update GRD, GRDP, and JSON source l10n files for C71*.20

2b5000f

Update XTB files for Chromium 71.0.3578.20

9148c99

Remove tab audio muton switch since it doesn't exist

77480ca

See in Chromium: commit 479cc17585a64910853e9949b053499ecbeca9a5 Author: Peter Kasting <pkasting@chromium.org> Date: Fri Sep 28 22:34:37 2018 +0000 Remove --enable-tab-audio-muting Per UX leads, this is dead. Bug: 752226

Remove root out dir causing build problems

8af85ef

...with std <version> vs generated file version

Disable test for Anthony TODO later

a86b4b5

mac_views_browser no longer exists and is the same as is_mac (toolkit…

c2e2a94

… views)

Temporarily remove newtab handling

09cb19a

TODO for Pete

features::kEnableEphemeralFlashPermission now always enabled

ed86bba

Various changes for Chromium 71.*.22

45f5e4e

Conditionally include Widevine things

ca167ef

To avoid new linking error by introduced build flag

Stop using TryResolveProxySynchronously in test

dc24827

--- commit 64df410d0ca79a8522d329e75ce8c21a9db77038 Author: Eric Roman <eroman@chromium.org> Date: Thu Oct 4 21:29:27 2018 +0000 Remove unused ProxyResolutionService::TryResolveProxySynchronously(). Bug: 721403 ---

New Tab Button for C71

83f9d09

Re-implements Brave's style for the New Tab Button against C71. Previously implemented against C70 in 966b6d5

Fix gcm_unitteset.cc for C71

01590cc

Refactor how cookie blocking works

bd44e31

Tests started to fail for cookie blockin C71, this makes it work again

bbondy dismissed darkdh’s stale review via bd44e31 October 30, 2018 18:59

bbondy force-pushed the 71.0.3578.20 branch from 079a6ed to bd44e31 Compare October 30, 2018 18:59

bbondy removed the pr/work-in-progress label Oct 30, 2018

petemill and others added 2 commits October 30, 2018 15:16

Implement Brave tab separator position and style for C71

17b0a54

Perhaps this simpler 4 line patch methodology will actually be simpler than the previous copy-and-patch method of the C70-targeted implementation de337bc#diff-d76fac9e942abff28ffedf5c3230d12d

Fix patch not applying causing a unit test failure

8306b4b

Auditors: @pilgrim-brave

bbondy merged commit 68bbcf0 into master Oct 30, 2018

bbondy added a commit that referenced this pull request Oct 30, 2018

Merge pull request #744 from brave/71.0.3578.20

e1418f1

Upgrade Chromium from 70.0.3538.67 to 71.0.3578.20

bbondy added the merged/0.57.x-Dev label Oct 30, 2018

yrliou mentioned this pull request Nov 1, 2018

Fix loading of PDF protected by cookie-based login #780

Merged

18 tasks

bsclifton deleted the 71.0.3578.20 branch November 5, 2018 18:49

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade Chromium from 70.0.3538.67 to 71.0.3578.20 #744

Upgrade Chromium from 70.0.3538.67 to 71.0.3578.20 #744

bbondy commented Oct 26, 2018 •

edited

Loading

bbondy commented Oct 30, 2018

bbondy commented Oct 30, 2018 •

edited

Loading

bbondy Oct 30, 2018

bbondy Oct 30, 2018

bbondy Oct 30, 2018

bbondy Oct 30, 2018

bbondy Oct 30, 2018

bbondy Oct 30, 2018 •

edited

Loading

bbondy Oct 30, 2018 •

edited

Loading

bbondy Oct 30, 2018

bbondy Oct 30, 2018

simonhong Oct 30, 2018

simonhong Oct 30, 2018 •

edited

Loading

bbondy Oct 30, 2018

bbondy Oct 30, 2018

bbondy Oct 30, 2018

bbondy commented Oct 30, 2018

		@@ -1,42 +0,0 @@
		/* This Source Code Form is subject to the terms of the Mozilla Public

Upgrade Chromium from 70.0.3538.67 to 71.0.3578.20 #744

Upgrade Chromium from 70.0.3538.67 to 71.0.3578.20 #744

Conversation

bbondy commented Oct 26, 2018 • edited Loading

Submitter Checklist:

Test Plan:

Reviewer Checklist:

bbondy commented Oct 30, 2018

bbondy commented Oct 30, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bbondy Oct 30, 2018 • edited Loading

Choose a reason for hiding this comment

bbondy Oct 30, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

simonhong Oct 30, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bbondy commented Oct 30, 2018

bbondy commented Oct 26, 2018 •

edited

Loading

bbondy commented Oct 30, 2018 •

edited

Loading

bbondy Oct 30, 2018 •

edited

Loading

bbondy Oct 30, 2018 •

edited

Loading

simonhong Oct 30, 2018 •

edited

Loading