Skip to content

Commit

Permalink
Upgrade patches from Chromium 71.0.3578.53 to 71.0.3578.75
Browse files Browse the repository at this point in the history
  • Loading branch information
bbondy committed Nov 29, 2018
1 parent 854b4c5 commit efe72e2
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 9e165f04da09eb5237c3ee2f3244b4492bf0fefa..48b98b11a12e27a8a947496765c590d799763267 100644
index 595dabb229d5ec21dbd0e6fc339cf488d7d91724..48b98b11a12e27a8a947496765c590d799763267 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=71
MINOR=0
-BUILD=3578
-PATCH=53
-PATCH=75
+BUILD=59
+PATCH=1
2 changes: 1 addition & 1 deletion patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 62f4b41a2ac4..4f63fa202bca 100644
index db54ccb61b9dd191bb4a82608999300797213402..a3dbe5e8c8621232c0cf1f7754049a187b94f032 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -264,14 +264,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-net-chrome_network_delegate.h.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h
index ff28a98eb0211dcdade60775cac2cf74f8319c8a..de8544c90c8b7658ff4bd46a90dd4bd36b230a1f 100644
index 8b37b38330975f2b23fceb915eadafe63e7a6790..fa07f1615c597e62cd53389bbed63426fcfdb5fa 100644
--- a/chrome/browser/net/chrome_network_delegate.h
+++ b/chrome/browser/net/chrome_network_delegate.h
@@ -105,6 +105,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl {
@@ -111,6 +111,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl {
static void EnableAccessToAllFilesForTesting(bool enabled);

private:
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-profiles-profile_impl.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 3c9591c492dc11b9ab9eaae4e9f2a073dc822107..5b2d3dfaee1d1b8f09367848571d7b925e5e68b8 100644
index 86d6ef5f78eed49efc0255e3492339fdee42e7cf..395f91fb944edf3931e7818f30b4eb1c645e813c 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -32,6 +32,7 @@
Expand All @@ -10,7 +10,7 @@ index 3c9591c492dc11b9ab9eaae4e9f2a073dc822107..5b2d3dfaee1d1b8f09367848571d7b92
#include "build/build_config.h"
#include "chrome/browser/background/background_contents_service_factory.h"
#include "chrome/browser/background_fetch/background_fetch_delegate_factory.h"
@@ -529,6 +530,9 @@ ProfileImpl::ProfileImpl(
@@ -528,6 +529,9 @@ ProfileImpl::ProfileImpl(
BrowserContextDependencyManager::GetInstance()
->RegisterProfilePrefsForServices(this, pref_registry_.get());

Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-profiles-profile_io_data.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 79dbe971ae23b9d59eafa4b89ecce9b736ae8707..a5a059aa77e533cfc56437cf06b5d6a21dfa0d4b 100644
index 3bfcba30be1ca17870b85acbc68ae15887f027fe..6a74ea76c00df34b9de30166cc891bba90a18f92 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -25,6 +25,7 @@
Expand Down
10 changes: 5 additions & 5 deletions patches/chrome-browser-profiles-profile_manager.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index af01ba808a5a07a2142319d232834621fd68ccd1..537363e1f262eb6771d1bf1d104363cc2f7831a4 100644
index 39bd5b180453f3e01cde401c36ae25b658ab952f..906fbab18befa7efac1cde0cf0448f284e2b72cf 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -1487,9 +1487,11 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
@@ -1482,9 +1482,11 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
const base::FilePath last_used_profile_path =
GetLastUsedProfileDir(user_data_dir_);
const base::FilePath guest_profile_path = GetGuestProfilePath();
Expand All @@ -14,23 +14,23 @@ index af01ba808a5a07a2142319d232834621fd68ccd1..537363e1f262eb6771d1bf1d104363cc
last_used_profile != nullptr &&
!last_used_profile->IsLegacySupervised()) {
FinishDeletingProfile(profile_dir, last_used_profile_path);
@@ -1502,6 +1504,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
@@ -1497,6 +1499,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
base::FilePath cur_path = profile->GetPath();
if (cur_path != profile_dir &&
cur_path != guest_profile_path &&
+ cur_path != tor_profile_path &&
!profile->IsLegacySupervised() &&
!IsProfileDirectoryMarkedForDeletion(cur_path)) {
OnNewActiveProfileLoaded(profile_dir, cur_path, std::move(callback),
@@ -1521,6 +1524,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
@@ -1516,6 +1519,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(
// legacy-supervised.
if (cur_path != profile_dir &&
cur_path != guest_profile_path &&
+ cur_path != tor_profile_path &&
!entry->IsLegacySupervised() &&
!IsProfileDirectoryMarkedForDeletion(cur_path)) {
fallback_profile_path = cur_path;
@@ -1873,6 +1877,7 @@ void ProfileManager::ScheduleForcedEphemeralProfileForDeletion(
@@ -1868,6 +1872,7 @@ void ProfileManager::ScheduleForcedEphemeralProfileForDeletion(
base::FilePath entry_path = entry->GetPath();
if (entry_path == profile_dir ||
entry_path == GetGuestProfilePath() ||
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
index 4f34fcacc9d9..52d3f8e02f65 100644
index 4f34fcacc9d92dda6cf7291a3752ed27f41f1bbf..52d3f8e02f65e50d854436efedbfbe78534f50b9 100644
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -41,7 +41,7 @@ using std::string;
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-ui-page_info-page_info_ui.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/page_info/page_info_ui.cc b/chrome/browser/ui/page_info/page_info_ui.cc
index 1b7476a6d578eb41a476efaa94da1c781c7a9227..21fc079ef3b6fde8ceb83ed522929eb660cfe15c 100644
index 8d491897e314e959a1f19999a3d39d7c27ca5d80..71e968adb5dcd1d61472a873cb2814d2d54ab3e8 100644
--- a/chrome/browser/ui/page_info/page_info_ui.cc
+++ b/chrome/browser/ui/page_info/page_info_ui.cc
@@ -28,6 +28,7 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index cd8430f1c8dd38796cc6f899069d39b7117a8ad7..bd75de137ac72c302edc724850bba783c0c023c6 100644
index c235469b5f0bbc96d00f73cc821e108bec4d63c0..534acc34136ee63489c5da67d22bca6d9c0f16fc 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -2842,6 +2842,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -2846,6 +2846,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
#endif
policy_indicator::AddLocalizedStrings(html_source);

Expand Down
2 changes: 1 addition & 1 deletion patches/components-domain_reliability-service.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/components/domain_reliability/service.cc b/components/domain_reliability/service.cc
index cf8287f98976..19c9dd11f725 100644
index cf8287f989767279f426103d308855614fa7ab20..19c9dd11f725ef6a1d5b7e284638b542e157f182 100644
--- a/components/domain_reliability/service.cc
+++ b/components/domain_reliability/service.cc
@@ -157,6 +157,7 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/components/invalidation/impl/fcm_network_handler.cc b/components/invalidation/impl/fcm_network_handler.cc
index cbf7f786cb7f..aff1bd9cf428 100644
index cbf7f786cb7f20d1646e90d72e1eebd9d593c70a..aff1bd9cf428628337a511b807e5e62ee0742ef3 100644
--- a/components/invalidation/impl/fcm_network_handler.cc
+++ b/components/invalidation/impl/fcm_network_handler.cc
@@ -86,6 +86,7 @@ FCMNetworkHandler::~FCMNetworkHandler() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/components/invalidation/impl/push_client_channel.cc b/components/invalidation/impl/push_client_channel.cc
index 709d8e562c22..9170819bb45e 100644
index 709d8e562c2238f00ac6a037395d16dca52b89e0..9170819bb45eb1060f5768a9a6922eb11ae85502 100644
--- a/components/invalidation/impl/push_client_channel.cc
+++ b/components/invalidation/impl/push_client_channel.cc
@@ -28,6 +28,7 @@ PushClientChannel::PushClientChannel(
Expand Down
4 changes: 2 additions & 2 deletions patches/content-browser-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index b9925142f676f2a66fb50c7679e28ab91f81031b..e1300c0319123545c5767a8fa3cbfaa78742df49 100644
index cf4d96c68568327f38552ebda79213d9da888f29..cd93ea6fcf681c7a8af7d1ca376bac6180198482 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2105,6 +2105,12 @@ jumbo_source_set("browser") {
@@ -2107,6 +2107,12 @@ jumbo_source_set("browser") {
"//ppapi/proxy:ipc",
"//ppapi/shared_impl",
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
index ff5926b4ae372e5567a9e77484a5666a0ed285c3..9caf6a820a7db9c03a5e04d7d3f0ad5e13a63c4a 100644
index 2638cce02bdb0505dce32a7a81f6e0cd6355074a..f6393f5cd6a5c8702f9579181401caf6fa6062df 100644
--- a/extensions/browser/api/web_request/web_request_api.cc
+++ b/extensions/browser/api/web_request/web_request_api.cc
@@ -1137,6 +1137,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
@@ -1145,6 +1145,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
const net::AuthChallengeInfo& auth_info,
net::NetworkDelegate::AuthCallback callback,
net::AuthCredentials* credentials) {
Expand Down

0 comments on commit efe72e2

Please sign in to comment.