Release 65.0.3325.218
This commit is contained in:
csagan5
parent
3abb1ad2a3
commit
a723e0e77d
4 changed files with 756 additions and 253 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -5,13 +5,13 @@ Subject: ungoogled-chromium: Disable untraceable URLs
|
|||
Disable additional URLs that are not caught by the "trk" scheme
|
||||
---
|
||||
chrome/browser/android/rlz/rlz_ping_handler.cc | 2 +-
|
||||
chrome/browser/plugins/plugins_resource_service.cc | 2 +-
|
||||
chrome/browser/plugins/plugins_resource_service.cc | 5 +----
|
||||
chrome/browser/safe_browsing/client_side_model_loader.cc | 6 ++----
|
||||
chrome/browser/safe_browsing/client_side_model_loader.h | 1 -
|
||||
rlz/lib/financial_ping.cc | 4 ++--
|
||||
rlz/lib/lib_values.cc | 1 -
|
||||
rlz/lib/lib_values.h | 1 -
|
||||
7 files changed, 6 insertions(+), 11 deletions(-)
|
||||
7 files changed, 6 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc
|
||||
--- a/chrome/browser/android/rlz/rlz_ping_handler.cc
|
||||
|
|
@ -28,7 +28,17 @@ diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/and
|
|||
diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
|
||||
--- a/chrome/browser/plugins/plugins_resource_service.cc
|
||||
+++ b/chrome/browser/plugins/plugins_resource_service.cc
|
||||
@@ -68,7 +68,7 @@ GURL GetPluginsServerURL() {
|
||||
@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
|
||||
// Delay between calls to update the cache 1 day and 2 minutes in testing mode.
|
||||
const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
|
||||
|
||||
-const char kPluginsServerUrl[] =
|
||||
- "https://www.gstatic.com/chrome/config/plugins_3/";
|
||||
-
|
||||
GURL GetPluginsServerURL() {
|
||||
std::string filename;
|
||||
#if defined(OS_WIN)
|
||||
@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() {
|
||||
#error Unknown platform
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ Make interception testable
|
|||
Add domain support
|
||||
Re-land: third-party filters support
|
||||
---
|
||||
net/BUILD.gn | 4 +-
|
||||
net/BUILD.gn | 9 +-
|
||||
net/url_request/adblock_intercept.cc | 324 ++++++++++++++++++++++++++++++++++
|
||||
net/url_request/adblock_intercept.h | 16 ++
|
||||
net/url_request/nochromo_intercept.cc | 116 ------------
|
||||
net/url_request/nochromo_intercept.h | 13 --
|
||||
net/url_request/url_request.cc | 14 +-
|
||||
6 files changed, 353 insertions(+), 134 deletions(-)
|
||||
net/url_request/url_request.cc | 19 +-
|
||||
6 files changed, 364 insertions(+), 133 deletions(-)
|
||||
create mode 100644 net/url_request/adblock_intercept.cc
|
||||
create mode 100644 net/url_request/adblock_intercept.h
|
||||
delete mode 100644 net/url_request/nochromo_intercept.cc
|
||||
|
|
@ -22,17 +22,29 @@ Re-land: third-party filters support
|
|||
diff --git a/net/BUILD.gn b/net/BUILD.gn
|
||||
--- a/net/BUILD.gn
|
||||
+++ b/net/BUILD.gn
|
||||
@@ -1739,8 +1739,8 @@ component("net") {
|
||||
@@ -1739,8 +1739,6 @@ component("net") {
|
||||
"url_request/url_fetcher_response_writer.h",
|
||||
"url_request/url_range_request_job.cc",
|
||||
"url_request/url_range_request_job.h",
|
||||
- "url_request/nochromo_intercept.cc",
|
||||
- "url_request/nochromo_intercept.h",
|
||||
+ "url_request/adblock_intercept.cc",
|
||||
+ "url_request/adblock_intercept.h",
|
||||
"url_request/url_request.cc",
|
||||
"url_request/url_request.h",
|
||||
"url_request/url_request_context.cc",
|
||||
@@ -1801,6 +1799,13 @@ component("net") {
|
||||
"//third_party/zlib",
|
||||
]
|
||||
|
||||
+ if (is_android) {
|
||||
+ sources += [
|
||||
+ "url_request/adblock_intercept.cc",
|
||||
+ "url_request/adblock_intercept.h"
|
||||
+ ]
|
||||
+ }
|
||||
+
|
||||
if (enable_reporting) {
|
||||
sources += [
|
||||
"network_error_logging/network_error_logging_service.cc",
|
||||
diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
|
|
@ -526,28 +538,33 @@ deleted file mode 100644
|
|||
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
|
||||
--- a/net/url_request/url_request.cc
|
||||
+++ b/net/url_request/url_request.cc
|
||||
@@ -44,7 +44,7 @@
|
||||
@@ -44,7 +44,9 @@
|
||||
#include "url/gurl.h"
|
||||
#include "url/origin.h"
|
||||
|
||||
-#include "net/url_request/nochromo_intercept.h"
|
||||
+#if defined(OS_ANDROID)
|
||||
+#include "net/url_request/adblock_intercept.h"
|
||||
+#endif
|
||||
|
||||
#if BUILDFLAG(ENABLE_REPORTING)
|
||||
#include "net/url_request/network_error_logging_delegate.h"
|
||||
@@ -558,7 +558,6 @@ URLRequest::URLRequest(const GURL& url,
|
||||
@@ -558,7 +560,9 @@ URLRequest::URLRequest(const GURL& url,
|
||||
: context->network_delegate()),
|
||||
net_log_(NetLogWithSource::Make(context->net_log(),
|
||||
NetLogSourceType::URL_REQUEST)),
|
||||
- url_chain_(1, url),
|
||||
+#if !defined(OS_ANDROID)
|
||||
url_chain_(1, url),
|
||||
+#endif
|
||||
method_("GET"),
|
||||
referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE),
|
||||
first_party_url_policy_(NEVER_CHANGE_FIRST_PARTY_URL),
|
||||
@@ -583,7 +582,16 @@ URLRequest::URLRequest(const GURL& url,
|
||||
@@ -583,7 +587,18 @@ URLRequest::URLRequest(const GURL& url,
|
||||
// Sanity check out environment.
|
||||
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
|
||||
|
||||
- if (nochromo_intercept(url)) url_chain_.push_back(nochromo_intercepted);
|
||||
+#if defined(OS_ANDROID)
|
||||
+ std::string initiatorHost;
|
||||
+ if (initiator_.has_value()) {
|
||||
+ initiatorHost = initiator_.value().host();
|
||||
|
|
@ -558,6 +575,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
|
|||
+ } else {
|
||||
+ url_chain_ = { url };
|
||||
+ }
|
||||
+#endif
|
||||
|
||||
context->url_requests()->insert(this);
|
||||
net_log_.BeginEvent(
|
||||
|
|
|
|||
|
|
@ -3,9 +3,22 @@ Date: Thu, 22 Mar 2018 22:11:57 +0100
|
|||
Subject: Battery API: return nothing
|
||||
|
||||
---
|
||||
services/device/battery/battery_status_service.cc | 2 +-
|
||||
.../Source/modules/battery/BatteryManager.cpp | 25 ++++------------------
|
||||
1 file changed, 4 insertions(+), 21 deletions(-)
|
||||
2 files changed, 5 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
|
||||
--- a/services/device/battery/battery_status_service.cc
|
||||
+++ b/services/device/battery/battery_status_service.cc
|
||||
@@ -41,7 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
|
||||
if (!battery_fetcher_)
|
||||
battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
|
||||
|
||||
-#if 0
|
||||
+#if !defined(OS_ANDROID)
|
||||
if (callback_list_.empty()) {
|
||||
bool success = battery_fetcher_->StartListeningBatteryChange();
|
||||
// On failure pass the default values back.
|
||||
diff --git a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
|
||||
--- a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
|
||||
+++ b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue