1 files changed, 60 insertions, 60 deletions

diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
index f8e7844..8b68a77 100644
--- a/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
@@ -1,9 +1,9 @@
 # Block all connection requests with 'qjz9zk' in the domain name or with a 'trk:' scheme.
 # This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
 
---- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetI
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig
++++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI
    if (base::IsStringASCII(scheme) &&
        (ProfileIOData::IsHandledProtocol(scheme) ||
         base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
@@ -11,8 +11,8 @@
         base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) ||
         base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) {
      return metrics::OmniboxInputType::URL;
---- a/chrome/browser/history/history_utils.cc
-+++ b/chrome/browser/history/history_utils.cc
+--- chrome/browser/history/history_utils.cc.orig
++++ chrome/browser/history/history_utils.cc
 @@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url)
        url.SchemeIs(content::kChromeDevToolsScheme) ||
        url.SchemeIs(content::kChromeUIScheme) ||
@@ -21,21 +21,21 @@
        url.SchemeIs(chrome::kChromeNativeScheme) ||
        url.SchemeIs(chrome::kChromeSearchScheme) ||
        url.SchemeIs(dom_distiller::kDomDistillerScheme))
---- a/chrome/browser/ui/singleton_tabs.cc
-+++ b/chrome/browser/ui/singleton_tabs.cc
-@@ -102,7 +102,8 @@ int GetIndexOfExistingTab(Browser* brows
-     // RewriteURLIfNecessary removes the "view-source:" scheme which could lead
-     // to incorrect matching, so ensure that the target and the candidate are
-     // either both view-source:, or neither is.
--    if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source) {
-+    if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source ||
-+        tab_url.SchemeIs(url::kTraceScheme)) {
+--- chrome/browser/ui/singleton_tabs.cc.orig
++++ chrome/browser/ui/singleton_tabs.cc
+@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows
+ 
+     // Skip view-source tabs. This is needed because RewriteURLIfNecessary
+     // removes the "view-source:" scheme which leads to incorrect matching.
+-    if (tab_url.SchemeIs(content::kViewSourceScheme))
++    if (tab_url.SchemeIs(content::kViewSourceScheme) ||
++        tab_url.SchemeIs(url::kTraceScheme))
        continue;
-     }
  
---- a/components/omnibox/browser/autocomplete_input.cc
-+++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -560,7 +560,8 @@ void AutocompleteInput::ParseForEmphasiz
+     GURL rewritten_tab_url = tab_url;
+--- components/omnibox/browser/autocomplete_input.cc.orig
++++ components/omnibox/browser/autocomplete_input.cc
+@@ -533,7 +533,8 @@ void AutocompleteInput::ParseForEmphasiz
    // For the view-source and blob schemes, we should emphasize the host of the
    // URL qualified by the view-source or blob prefix.
    if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
@@ -45,8 +45,8 @@
        (static_cast<int>(text.length()) > after_scheme_and_colon)) {
      // Obtain the URL prefixed by view-source or blob and parse it.
      std::u16string real_url(text.substr(after_scheme_and_colon));
---- a/components/url_formatter/url_fixer.cc
-+++ b/components/url_formatter/url_fixer.cc
+--- components/url_formatter/url_fixer.cc.orig
++++ components/url_formatter/url_fixer.cc
 @@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, c
      }
    }
@@ -58,19 +58,19 @@
    // We handle the file scheme separately.
    if (scheme == url::kFileScheme)
      return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
---- a/content/browser/child_process_security_policy_impl.cc
-+++ b/content/browser/child_process_security_policy_impl.cc
-@@ -735,6 +735,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
-   RegisterWebSafeScheme(url::kWssScheme);
+--- content/browser/child_process_security_policy_impl.cc.orig
++++ content/browser/child_process_security_policy_impl.cc
+@@ -861,6 +861,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
  #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
+   RegisterWebSafeScheme(url::kFtpScheme);
    RegisterWebSafeScheme(url::kDataScheme);
 +  RegisterWebSafeScheme(url::kTraceScheme);
+   RegisterWebSafeScheme("feed");
  
    // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
-   // other origins, so we should not treat them as web safe. Remove callers of
---- a/net/BUILD.gn
-+++ b/net/BUILD.gn
-@@ -1004,6 +1004,8 @@ component("net") {
+--- net/BUILD.gn.orig
++++ net/BUILD.gn
+@@ -1010,6 +1010,8 @@ component("net") {
      "url_request/report_sender.h",
      "url_request/static_http_user_agent_settings.cc",
      "url_request/static_http_user_agent_settings.h",
@@ -80,7 +80,7 @@
      "url_request/url_fetcher.h",
      "url_request/url_fetcher_core.cc",
 --- /dev/null
-+++ b/net/url_request/trk_protocol_handler.cc
++++ net/url_request/trk_protocol_handler.cc
 @@ -0,0 +1,25 @@
 +// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
@@ -108,8 +108,8 @@
 +
 +}  // namespace net
 --- /dev/null
-+++ b/net/url_request/trk_protocol_handler.h
-@@ -0,0 +1,30 @@
++++ net/url_request/trk_protocol_handler.h
+@@ -0,0 +1,32 @@
 +// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -118,6 +118,7 @@
 +#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
 +
 +#include "base/compiler_specific.h"
++#include "base/macros.h"
 +#include "net/base/net_export.h"
 +#include "net/url_request/url_request_job_factory.h"
 +
@@ -130,18 +131,19 @@
 +    : public URLRequestJobFactory::ProtocolHandler {
 + public:
 +  TrkProtocolHandler();
-+  TrkProtocolHandler(const TrkProtocolHandler&) = delete;
-+  TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete;
 +  std::unique_ptr<URLRequestJob> CreateJob(
 +      URLRequest* request) const override;
 +  bool IsSafeRedirectTarget(const GURL& location) const override;
++
++ private:
++  DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler);
 +};
 +
 +}  // namespace net
 +
 +#endif  // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
---- a/net/url_request/url_request.cc
-+++ b/net/url_request/url_request.cc
+--- net/url_request/url_request.cc.orig
++++ net/url_request/url_request.cc
 @@ -12,6 +12,7 @@
  #include "base/compiler_specific.h"
  #include "base/metrics/histogram_macros.h"
@@ -150,7 +152,7 @@
  #include "base/strings/utf_string_conversions.h"
  #include "base/synchronization/lock.h"
  #include "base/threading/thread_task_runner_handle.h"
-@@ -45,6 +46,7 @@
+@@ -46,6 +47,7 @@
  #include "net/url_request/url_request_redirect_job.h"
  #include "url/gurl.h"
  #include "url/origin.h"
@@ -158,7 +160,7 @@
  
  using base::Time;
  using std::string;
-@@ -609,6 +611,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -595,6 +597,12 @@ URLRequest::URLRequest(const GURL& url,
    // Sanity check out environment.
    DCHECK(base::ThreadTaskRunnerHandle::IsSet());
  
@@ -171,17 +173,17 @@
    context->url_requests()->insert(this);
    net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] {
      return NetLogURLRequestConstructorParams(url, priority_,
---- a/net/url_request/url_request_context_builder.cc
-+++ b/net/url_request/url_request_context_builder.cc
-@@ -47,6 +47,7 @@
- #include "net/socket/network_binding_client_socket_factory.h"
+--- net/url_request/url_request_context_builder.cc.orig
++++ net/url_request/url_request_context_builder.cc
+@@ -46,6 +46,7 @@
+ #include "net/quic/quic_stream_factory.h"
  #include "net/ssl/ssl_config_service_defaults.h"
  #include "net/url_request/static_http_user_agent_settings.h"
 +#include "net/url_request/trk_protocol_handler.h"
  #include "net/url_request/url_request_context.h"
  #include "net/url_request/url_request_context_storage.h"
  #include "net/url_request/url_request_job_factory.h"
-@@ -628,6 +629,9 @@ std::unique_ptr<URLRequestContext> URLRe
+@@ -546,6 +547,9 @@ std::unique_ptr<URLRequestContext> URLRe
    }
    protocol_handlers_.clear();
  
@@ -191,30 +193,28 @@
    storage->set_job_factory(std::move(job_factory));
  
    return std::move(context);
---- a/url/url_constants.cc
-+++ b/url/url_constants.cc
-@@ -46,6 +46,8 @@ const char kQuicTransportScheme[] = "qui
- const char16_t kQuicTransportScheme16[] = u"quic-transport";
+--- url/url_constants.cc.orig
++++ url/url_constants.cc
+@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto";
+ // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport
+ const char kQuicTransportScheme[] = "quic-transport";
  const char kTelScheme[] = "tel";
- const char16_t kTelScheme16[] = u"tel";
 +const char kTraceScheme[] = "trk";
-+const char16_t kTraceScheme16[] = u"trk";
  const char kUrnScheme[] = "urn";
- const char16_t kUrnScheme16[] = u"urn";
- const char kUuidInPackageScheme[] = "uuid-in-package";
---- a/url/url_constants.h
-+++ b/url/url_constants.h
-@@ -50,6 +50,8 @@ COMPONENT_EXPORT(URL) extern const char
- COMPONENT_EXPORT(URL) extern const char16_t kQuicTransportScheme16[];
+ const char kWsScheme[] = "ws";
+ const char kWssScheme[] = "wss";
+--- url/url_constants.h.orig
++++ url/url_constants.h
+@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char
+ COMPONENT_EXPORT(URL) extern const char kMailToScheme[];
+ COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[];
  COMPONENT_EXPORT(URL) extern const char kTelScheme[];
- COMPONENT_EXPORT(URL) extern const char16_t kTelScheme16[];
 +COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
-+COMPONENT_EXPORT(URL) extern const char16_t kTraceScheme16[];
  COMPONENT_EXPORT(URL) extern const char kUrnScheme[];
- COMPONENT_EXPORT(URL) extern const char16_t kUrnScheme16[];
- COMPONENT_EXPORT(URL) extern const char kUuidInPackageScheme[];
---- a/url/url_util.cc
-+++ b/url/url_util.cc
+ COMPONENT_EXPORT(URL) extern const char kWsScheme[];
+ COMPONENT_EXPORT(URL) extern const char kWssScheme[];
+--- url/url_util.cc.orig
++++ url/url_util.cc
 @@ -63,7 +63,7 @@ struct SchemeRegistry {
  
    // Schemes that do not trigger mixed content warning.