Skip to content

Commit

Permalink
Upgrade patches from Chromium "75.0.3770.27" to Chromium 75.0.3770.38
Browse files Browse the repository at this point in the history
  • Loading branch information
brave-browser-releases authored and bsclifton committed May 18, 2019
1 parent 3ae0d90 commit 7aa756e
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 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 6b39adf46843f856d93895b2fb11095a3ce7eade..de09f4a77342392f96fe6eb2b767f251d71474a5 100644
index 678a8da0ba33c3b81d8b9b17fce60641eb760dcf..de09f4a77342392f96fe6eb2b767f251d71474a5 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=75
MINOR=0
-BUILD=3770
-PATCH=27
-PATCH=38
+BUILD=65
+PATCH=95
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index 73e35f8d848eedb01a447f50bfd4ecce373a07fe..440dafcb5e7b195d584ccc91bf8b625ac9b8bbf9 100644
index ab6c99a40a84961a61eea241a9dd346f8174eb48..dcdf09c4a5748032716fbc70bad7d12a15c7c566 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -16,6 +16,7 @@
Expand All @@ -10,7 +10,7 @@ index 73e35f8d848eedb01a447f50bfd4ecce373a07fe..440dafcb5e7b195d584ccc91bf8b625a
#include "chrome/browser/extensions/extension_management_constants.h"
#include "chrome/browser/extensions/extension_management_internal.h"
#include "chrome/browser/extensions/external_policy_loader.h"
@@ -629,7 +630,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
@@ -626,7 +627,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
TRACE_EVENT0("browser,startup",
"ExtensionManagementFactory::BuildServiceInstanceFor");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h
index 7d7fa1ab5224211906bb953da639b7c29856bc24..9e6a18297865c9b1120bfffd6af98a028f25d67f 100644
index 0633000fd4db48c83365b900824996a2a55364db..da2c4c8931cf14072cf6bacd1648164652ee65f4 100644
--- a/chrome/browser/extensions/extension_management.h
+++ b/chrome/browser/extensions/extension_management.h
@@ -174,6 +174,7 @@ class ExtensionManagement : public KeyedService {
bool ShouldUninstallPolicyBlacklistedExtensions() const;
@@ -173,6 +173,7 @@ class ExtensionManagement : public KeyedService {
std::string* required_version) const;

private:
+ friend class BraveExtensionManagement;
Expand Down
6 changes: 3 additions & 3 deletions patches/content-browser-storage_partition_impl.cc.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index 3ab76283f2f892b2fff9cb5688e6324a9410a0b7..56a4ac58e37db53d2354b2caaa4897d1c5ed777f 100644
index ab64e8ae556da9444770eb6482159ee2b5073b66..bed2dc653a75d550be95e24ed888eb68e8c0c6b3 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -975,6 +975,7 @@ void StoragePartitionImpl::OnCanSendReportingReports(
@@ -976,6 +976,7 @@ void StoragePartitionImpl::OnCanSendReportingReports(
bool allowed = permission_controller->GetPermissionStatus(
PermissionType::BACKGROUND_SYNC, origin_url,
origin_url) == blink::mojom::PermissionStatus::GRANTED;
+ allowed = false; // feature disabled in Brave
if (allowed)
origins_out.push_back(origin);
}
@@ -987,7 +988,7 @@ void StoragePartitionImpl::OnCanSendDomainReliabilityUpload(
@@ -988,7 +989,7 @@ void StoragePartitionImpl::OnCanSendDomainReliabilityUpload(
OnCanSendDomainReliabilityUploadCallback callback) {
PermissionController* permission_controller =
BrowserContext::GetPermissionController(browser_context_);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
index acc32e5ee98895dbff0a7b5a4f0feb3ef000aef9..7248de488e0c91977e91081dce182b8436ef388e 100644
index 98176198d5cdecb09b0ed889f414b52358afa81c..de55abfcd7fe0b2e0d49ff3c6f4924df9c585e3a 100644
--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
@@ -37,6 +37,7 @@
Expand All @@ -10,7 +10,7 @@ index acc32e5ee98895dbff0a7b5a4f0feb3ef000aef9..7248de488e0c91977e91081dce182b84
#include "build/build_config.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/platform/task_type.h"
@@ -902,6 +903,8 @@ String HTMLCanvasElement::ToDataURLInternal(
@@ -904,6 +905,8 @@ String HTMLCanvasElement::ToDataURLInternal(
String HTMLCanvasElement::toDataURL(const String& mime_type,
const ScriptValue& quality_argument,
ExceptionState& exception_state) const {
Expand All @@ -19,7 +19,7 @@ index acc32e5ee98895dbff0a7b5a4f0feb3ef000aef9..7248de488e0c91977e91081dce182b84
if (!OriginClean()) {
exception_state.ThrowSecurityError("Tainted canvases may not be exported.");
return String();
@@ -920,6 +923,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback,
@@ -922,6 +925,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback,
const String& mime_type,
const ScriptValue& quality_argument,
ExceptionState& exception_state) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
index dc6ecdc327c2d582b2219bfb24021a60972df00f..c60df515e9d6d044f76a5c8f3819f2bafb25466e 100644
index a84a1980eaa7d2a402bc10e60313830a3d954fe7..ce798b6923cb8b0f134d8b3a2774e1ca62a56962 100644
--- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
+++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
@@ -39,6 +39,7 @@
Expand Down Expand Up @@ -47,7 +47,7 @@ index dc6ecdc327c2d582b2219bfb24021a60972df00f..c60df515e9d6d044f76a5c8f3819f2ba
if (CallErrorCallbackIfSignalingStateClosed(signaling_state_, error_callback))
return ScriptPromise::CastUndefined(script_state);

@@ -1206,6 +1214,8 @@ void RTCPeerConnection::ReportSetSdpUsage(
@@ -1232,6 +1240,8 @@ void RTCPeerConnection::ReportSetSdpUsage(
ScriptPromise RTCPeerConnection::setLocalDescription(
ScriptState* script_state,
const RTCSessionDescriptionInit* session_description_init) {
Expand All @@ -56,7 +56,7 @@ index dc6ecdc327c2d582b2219bfb24021a60972df00f..c60df515e9d6d044f76a5c8f3819f2ba
MaybeWarnAboutUnsafeSdp(session_description_init);
ReportSetSdpUsage(SetSdpOperationType::kSetLocalDescription,
session_description_init);
@@ -1253,6 +1263,8 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
@@ -1279,6 +1289,8 @@ ScriptPromise RTCPeerConnection::setLocalDescription(
WebFeature::
kRTCPeerConnectionSetLocalDescriptionLegacyNoFailureCallback);
}
Expand All @@ -65,7 +65,7 @@ index dc6ecdc327c2d582b2219bfb24021a60972df00f..c60df515e9d6d044f76a5c8f3819f2ba

String sdp;
DOMException* exception =
@@ -1306,6 +1318,8 @@ RTCSessionDescription* RTCPeerConnection::pendingLocalDescription() {
@@ -1332,6 +1344,8 @@ RTCSessionDescription* RTCPeerConnection::pendingLocalDescription() {
ScriptPromise RTCPeerConnection::setRemoteDescription(
ScriptState* script_state,
const RTCSessionDescriptionInit* session_description_init) {
Expand All @@ -74,7 +74,7 @@ index dc6ecdc327c2d582b2219bfb24021a60972df00f..c60df515e9d6d044f76a5c8f3819f2ba
MaybeWarnAboutUnsafeSdp(session_description_init);
ReportSetSdpUsage(SetSdpOperationType::kSetRemoteDescription,
session_description_init);
@@ -1355,6 +1369,8 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
@@ -1381,6 +1395,8 @@ ScriptPromise RTCPeerConnection::setRemoteDescription(
WebFeature::
kRTCPeerConnectionSetRemoteDescriptionLegacyNoFailureCallback);
}
Expand Down
4 changes: 2 additions & 2 deletions patches/tools-metrics-histograms-histograms.xml.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 57a01981d23487ae33704bc05b28dc5987a7f0b9..57f07962f5abf103d457b8aba726ae90c1aa1b26 100644
index ce309b476fec05d3097d4a82fd7774d9196cf316..5580f23ef4217f3f8d5298940e2cabd318b2a370 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -152264,6 +152264,7 @@ should be kept until we use this API. -->
@@ -152399,6 +152399,7 @@ should be kept until we use this API. -->
<suffix name="ProtectedMedia" label="Protected media permission"/>
<suffix name="PushMessaging" label="Push messaging permission"/>
<suffix name="Quota" label="Quota permission"/>
Expand Down

0 comments on commit 7aa756e

Please sign in to comment.