Update existing ungoogled-chromium patches to v60

resources/patches/ungoogled-chromium/add-flag-to-disable-trkbar.patch

@@ -11,8 +11,8 @@
 -#endif
  
  #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
- #include "chrome/app/mash/mash_runner.h"
-@@ -53,20 +48,6 @@ int ChromeMain(int argc, const char** ar
+ #include "services/service_manager/runner/common/client_util.h"
+@@ -50,20 +45,6 @@ int ChromeMain(int argc, const char** ar
  }
  #endif
  
@@ -33,8 +33,8 @@
  #if defined(OS_WIN)
  DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                   sandbox::SandboxInterfaceInfo* sandbox_info,
-@@ -137,9 +118,6 @@ int ChromeMain(int argc, const char** ar
-   }
+@@ -125,9 +106,6 @@ int ChromeMain(int argc, const char** ar
+     params.env_mode = aura::Env::Mode::MUS;
  #endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
  
 -#if !defined(CHROME_MULTIPLE_DLL_CHILD)
@@ -43,38 +43,23 @@
    int rv = content::ContentMain(params);
  
  #if defined(OS_WIN)
---- a/chrome/app/generated_resources.grd
-+++ b/chrome/app/generated_resources.grd
-@@ -5292,6 +5292,12 @@ Keep your key file in a safe place. You
-       <message name="IDS_FLAGS_DEBUG_SHORTCUTS_NAME" desc="Name of the 'Debugging keyboard shortcuts' lab.">
-         Debugging keyboard shortcuts
-       </message>
-+      <message name="IDS_FLAGS_DISABLE_TRKBAR_NAME" desc="Name of the 'Disable 'Blocked request to ...' infobars' setting.">
-+        Disable 'Blocked request to ...' infobars
-+      </message>
-+      <message name="IDS_FLAGS_DISABLE_TRKBAR_DESCRIPTION" desc="Description of the 'Disable 'Blocked request to ...' infobars' setting.">
-+        Disables the 'Blocked request to ...' infobars that show for blocked connection attempts to trk: schemes or the substituted domain qjz9zk.
-+      </message>
-       <message name="IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME" desc="Name of the 'Ignore GPU blacklist' lab.">
-         Override software rendering list
-       </message>
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -744,6 +744,11 @@ const FeatureEntry::FeatureVariation
+@@ -1086,6 +1086,11 @@ const FeatureEntry::FeatureVariation kOm
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {
 +#if !defined(CHROME_MULTIPLE_DLL_CHILD)
-+    {"disable-trkbar", IDS_FLAGS_DISABLE_TRKBAR_NAME,
-+     IDS_FLAGS_DISABLE_TRKBAR_DESCRIPTION, kOsDesktop,
++    {"disable-trkbar", flag_descriptions::kDisableTrkbarName,
++     flag_descriptions::kDisableTrkbarDescription, kOsDesktop,
 +     SINGLE_VALUE_TYPE("disable-trkbar")},
 +#endif
-     {"ignore-gpu-blacklist", IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME,
-      IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION, kOsAll,
+     {"ignore-gpu-blacklist", flag_descriptions::kIgnoreGpuBlacklistName,
+      flag_descriptions::kIgnoreGpuBlacklistDescription, kOsAll,
       SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -280,8 +280,27 @@
+@@ -279,8 +279,27 @@
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
  #endif
  
@@ -102,7 +87,7 @@
  namespace {
  
  // A provider of Geolocation services to override AccessTokenStore.
-@@ -1061,6 +1080,13 @@ int ChromeBrowserMainParts::PreCreateThr
+@@ -1049,6 +1068,13 @@ int ChromeBrowserMainParts::PreCreateThr
      about_flags::ConvertFlagsToSwitches(&flags_storage,
                                          base::CommandLine::ForCurrentProcess(),
                                          flags_ui::kAddSentinels);
@@ -116,3 +101,30 @@
    }
  #endif  // !defined(OS_CHROMEOS)
    // The MaterialDesignController needs to look at command line flags, which
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -336,6 +336,12 @@ const char kUiPartialSwapDescription[] =
+ 
+ const char kDebugShortcutsName[] = "Debugging keyboard shortcuts";
+ 
++const char kDisableTrkbarName[] = "Disable 'Blocked request to ...' infobars";
++
++const char kDisableTrkbarDescription[] =
++    "Disables the 'Blocked request to ...' infobars that show for blocked "
++    "connection attempts to trk: schemes or the substituted domain qjz9zk.";
++
+ const char kIgnoreGpuBlacklistName[] = "Override software rendering list";
+ 
+ const char kIgnoreGpuBlacklistDescription[] =
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -397,6 +397,9 @@ extern const char kHostedAppShimCreation
+ extern const char kIconNtpName[];
+ extern const char kIconNtpDescription[];
+ 
++extern const char kDisableTrkbarName[];
++extern const char kDisableTrkbarDescription[];
++
+ extern const char kIgnoreGpuBlacklistName[];
+ extern const char kIgnoreGpuBlacklistDescription[];
+ 

resources/patches/ungoogled-chromium/add-ipv6-probing-option.patch

@@ -3,7 +3,7 @@
 
 --- a/net/dns/host_resolver_impl.cc
 +++ b/net/dns/host_resolver_impl.cc
-@@ -19,6 +19,7 @@
+@@ -29,6 +29,7 @@
  #include "base/bind_helpers.h"
  #include "base/callback.h"
  #include "base/callback_helpers.h"
@@ -11,7 +11,7 @@
  #include "base/compiler_specific.h"
  #include "base/debug/debugger.h"
  #include "base/debug/leak_annotations.h"
-@@ -94,11 +95,6 @@ const unsigned kMinimumTTLSeconds = kCac
+@@ -108,11 +109,6 @@ const unsigned kMinimumTTLSeconds = kCac
  // cached.
  const int kIPv6ProbePeriodMs = 1000;
  
@@ -23,7 +23,7 @@
  // We use a separate histogram name for each platform to facilitate the
  // display of error codes by their symbolic name (since each platform has
  // different mappings).
-@@ -2378,7 +2374,7 @@ bool HostResolverImpl::IsIPv6Reachable(c
+@@ -2398,7 +2394,7 @@ bool HostResolverImpl::IsIPv6Reachable(c
    if ((base::TimeTicks::Now() - last_ipv6_probe_time_).InMilliseconds() >
        kIPv6ProbePeriodMs) {
      last_ipv6_probe_result_ =

resources/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/app/chrome_command_ids.h
 +++ b/chrome/app/chrome_command_ids.h
-@@ -146,6 +146,7 @@
+@@ -143,6 +143,7 @@
  #define IDC_DEV_TOOLS_INSPECT           40023
  #define IDC_UPGRADE_DIALOG              40024
  #define IDC_VIEW_INCOMPATIBILITIES      40025
@@ -12,7 +12,7 @@
  #define IDC_BOOKMARKS_MENU              40029
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -1199,6 +1199,9 @@ Subsequent notifications, windows and di
+@@ -1034,6 +1034,9 @@ Subsequent notifications, windows and di
          <message name="IDS_CLEAR_BROWSING_DATA" desc="The text label for the menu item for clearing of browsing data">
            &amp;Clear browsing data...
          </message>
@@ -22,7 +22,7 @@
          <message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
            &amp;Downloads
          </message>
-@@ -1234,6 +1237,9 @@ Subsequent notifications, windows and di
+@@ -1072,6 +1075,9 @@ Subsequent notifications, windows and di
          <message name="IDS_CLEAR_BROWSING_DATA" desc="In Title Case: The text label for the menu item for clearing of browsing data">
            &amp;Clear Browsing Data...
          </message>
@@ -34,7 +34,7 @@
          </message>
 --- a/chrome/browser/ui/toolbar/app_menu_model.cc
 +++ b/chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -203,6 +203,7 @@ void ToolsMenuModel::Build(Browser* brow
+@@ -200,6 +200,7 @@ void ToolsMenuModel::Build(Browser* brow
  
    AddSeparator(ui::NORMAL_SEPARATOR);
    AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
@@ -42,7 +42,7 @@
    AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
    if (chrome::CanOpenTaskManager())
      AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
-@@ -464,6 +465,13 @@ void AppMenuModel::LogMenuMetrics(int co
+@@ -455,6 +456,13 @@ void AppMenuModel::LogMenuMetrics(int co
        }
        LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
        break;
@@ -59,16 +59,16 @@
 --- a/chrome/browser/ui/toolbar/app_menu_model.h
 +++ b/chrome/browser/ui/toolbar/app_menu_model.h
 @@ -72,6 +72,7 @@ enum AppMenuAction {
-   MENU_ACTION_BOOKMARK_OPEN = 42,
    MENU_ACTION_UPGRADE_DIALOG = 44,
    MENU_ACTION_CAST = 45,
-+  MENU_ACTION_CLEAR_HTTP_AUTH_CACHE = 46,
+   MENU_ACTION_BETA_FORUM = 46,
++  MENU_ACTION_CLEAR_HTTP_AUTH_CACHE = 47,
    LIMIT_MENU_ACTION
  };
  
 --- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
 +++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
-@@ -229,6 +229,7 @@ GlobalMenuBarCommand tools_menu[] = {
+@@ -225,6 +225,7 @@ GlobalMenuBarCommand tools_menu[] = {
  
      {IDS_TASK_MANAGER, IDC_TASK_MANAGER},
      {IDS_CLEAR_BROWSING_DATA, IDC_CLEAR_BROWSING_DATA},
@@ -88,7 +88,7 @@
  
  #if defined(OS_MACOSX)
  #include "chrome/browser/ui/browser_commands_mac.h"
-@@ -589,6 +592,9 @@ void BrowserCommandController::ExecuteCo
+@@ -600,6 +603,9 @@ void BrowserCommandController::ExecuteCo
      case IDC_CLEAR_BROWSING_DATA:
        ShowClearBrowsingDataDialog(browser_);
        break;
@@ -98,35 +98,27 @@
      case IDC_IMPORT_SETTINGS:
        ShowImportDialog(browser_);
        break;
-@@ -789,6 +795,7 @@ void BrowserCommandController::InitComma
-                                         !guest_session &&
+@@ -810,6 +816,7 @@ void BrowserCommandController::InitComma
                                          !profile()->IsOffTheRecord());
-   command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, normal_window);
+   command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
+                                         !guest_session);
 +  command_updater_.UpdateCommandEnabled(IDC_CLEAR_HTTP_AUTH_CACHE, true);
  #if defined(OS_CHROMEOS)
    command_updater_.UpdateCommandEnabled(IDC_TAKE_SCREENSHOT, true);
    command_updater_.UpdateCommandEnabled(IDC_TOUCH_HUD_PROJECTION_TOGGLE, true);
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -114330,6 +114330,7 @@ from previous Chrome versions.
-   <int value="43" label="Exit"/>
-   <int value="44" label="Upgrade browser"/>
-   <int value="45" label="Cast"/>
-+  <int value="46" label="Clear HTTP auth cache"/>
- </enum>
- 
- <enum name="XFrameOptions" type="int">
-@@ -122830,6 +122831,7 @@ from previous Chrome versions.
-     </obsolete>
+@@ -94909,6 +94909,7 @@ http://cs/file:chrome/histograms.xml - b
    </suffix>
    <suffix name="Cast"/>
+   <suffix name="BetaForum"/>
 +  <suffix name="ClearHttpAuthCache"/>
    <affected-histogram name="WrenchMenu.TimeToAction"/>
  </histogram_suffixes>
  
 --- a/net/http/http_auth_cache.cc
 +++ b/net/http/http_auth_cache.cc
-@@ -252,6 +252,10 @@ bool HttpAuthCache::Remove(const GURL& o
+@@ -253,6 +253,10 @@ bool HttpAuthCache::Remove(const GURL& o
    return false;
  }
  
@@ -136,7 +128,7 @@
 +
  void HttpAuthCache::ClearEntriesAddedWithin(base::TimeDelta duration) {
    base::TimeTicks begin_time = base::TimeTicks::Now() - duration;
-   entries_.remove_if([begin_time](const Entry& entry) {
+   base::EraseIf(entries_, [begin_time](const Entry& entry) {
 --- a/net/http/http_auth_cache.h
 +++ b/net/http/http_auth_cache.h
 @@ -166,6 +166,8 @@ class NET_EXPORT HttpAuthCache {
@@ -148,3 +140,13 @@
    // Clears cache entries created within |duration| of base::TimeTicks::Now().
    void ClearEntriesAddedWithin(base::TimeDelta duration);
  
+--- a/tools/metrics/histograms/enums.xml
++++ b/tools/metrics/histograms/enums.xml
+@@ -38509,6 +38509,7 @@ from previous Chrome versions.
+   <int value="43" label="Exit"/>
+   <int value="44" label="Upgrade browser"/>
+   <int value="45" label="Cast"/>
++  <int value="47" label="Clear HTTP auth cache"/>
+ </enum>
+ 
+ <enum name="XFrameOptions" type="int">

resources/patches/ungoogled-chromium/disable-domain-reliability.patch

@@ -11,7 +11,7 @@
  namespace {
  
  struct GoogleConfigParams {
-@@ -564,17 +564,11 @@ static std::unique_ptr<DomainReliability
+@@ -568,17 +568,11 @@ static std::unique_ptr<DomainReliability
  }
  
  }  // namespace
@@ -32,7 +32,7 @@
  }  // namespace domain_reliability
 --- a/components/domain_reliability/uploader.cc
 +++ b/components/domain_reliability/uploader.cc
-@@ -75,7 +75,7 @@ class DomainReliabilityUploaderImpl
+@@ -78,7 +78,7 @@ class DomainReliabilityUploaderImpl
      VLOG(1) << "Uploading report to " << upload_url;
      VLOG(2) << "Report JSON: " << report_json;
  

resources/patches/ungoogled-chromium/disable-download-quarantine.patch

@@ -51,9 +51,9 @@
  
 --- a/content/common/BUILD.gn
 +++ b/content/common/BUILD.gn
-@@ -248,11 +248,6 @@ source_set("common") {
-     "plugin_list.cc",
-     "plugin_list.h",
+@@ -262,11 +262,6 @@ source_set("common") {
+     "presentation/presentation_struct_traits.cc",
+     "presentation/presentation_struct_traits.h",
      "process_type.cc",
 -    "quarantine/quarantine.cc",
 -    "quarantine/quarantine_constants_linux.h",
@@ -62,7 +62,7 @@
 -    "quarantine/quarantine_win.cc",
      "quota_messages.h",
      "render_process_messages.h",
-     "resize_params.cc",
+     "render_widget_surface_properties.cc",
 --- a/content/common/quarantine/quarantine.cc
 +++ b/content/common/quarantine/quarantine.cc
 @@ -6,8 +6,6 @@
@@ -82,7 +82,7 @@
 -#endif  // !WIN && !MAC && !LINUX
 --- a/content/public/common/BUILD.gn
 +++ b/content/public/common/BUILD.gn
-@@ -192,7 +192,6 @@ source_set("common_sources") {
+@@ -195,7 +195,6 @@ source_set("common_sources") {
      "push_messaging_status.cc",
      "push_messaging_status.h",
      "push_subscription_options.h",
@@ -100,7 +100,7 @@
  #include "crypto/secure_hash.h"
  #include "net/base/net_errors.h"
  #include "net/log/net_log.h"
-@@ -380,7 +379,7 @@ DownloadInterruptReason BaseFile::LogInt
+@@ -387,7 +386,7 @@ DownloadInterruptReason BaseFile::LogInt
    return reason;
  }
  
@@ -109,7 +109,7 @@
  
  namespace {
  
-@@ -463,7 +462,7 @@ DownloadInterruptReason BaseFile::Annota
+@@ -470,7 +469,7 @@ DownloadInterruptReason BaseFile::Annota
    }
    return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
  }

resources/patches/ungoogled-chromium/disable-fonts-googleapis-references.patch

@@ -2,7 +2,7 @@
 
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -302,7 +302,7 @@ void DomDistillerViewerSource::WillServi
+@@ -298,7 +298,7 @@ bool DomDistillerViewerSource::ShouldSer
  
  std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
      const {
@@ -11,17 +11,6 @@
  }
  
  std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const {
---- a/components/dom_distiller/core/html/dom_distiller_viewer.html
-+++ b/components/dom_distiller/core/html/dom_distiller_viewer.html
-@@ -12,7 +12,7 @@ found in the LICENSE file.
-   <title>$1</title>
-   <!-- Placeholder for CSS. -->
-   $2
--  <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
-+  <link href='chrome://resources/css/roboto.css' rel='stylesheet' type='text/css'>
- </head>
- <body class="$3">
-   <div id="contentWrap">
 --- a/components/dom_distiller/core/html/preview.html
 +++ b/components/dom_distiller/core/html/preview.html
 @@ -11,7 +11,7 @@ found in the LICENSE file.
@@ -76,3 +65,14 @@
  $extrastylesheet
  </head>
  <body>
+--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
++++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+@@ -120,7 +120,7 @@ function maybeSetWebFont() {
+   if (distiller_on_ios) return;
+ 
+   var e = document.createElement('link');
+-  e.href = 'https://fonts.googleapis.com/css?family=Roboto';
++  e.href = 'chrome://resources/css/roboto.css';
+   e.rel = 'stylesheet';
+   e.type = 'text/css';
+   document.head.appendChild(e);

resources/patches/ungoogled-chromium/disable-formatting-in-omnibox.patch

@@ -2,7 +2,7 @@
 
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -622,10 +622,10 @@ bool IDNToUnicodeOneComponent(const base
+@@ -353,10 +353,10 @@ bool IDNToUnicodeOneComponent(const base
  
  }  // namespace
  

resources/patches/ungoogled-chromium/disable-gaia.patch

@@ -73,13 +73,13 @@
  void UnloadGaiaAuthExtension(BrowserContext* context) {
 --- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
 +++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
-@@ -80,7 +80,6 @@ bool IsComponentExtensionWhitelisted(int
+@@ -78,7 +78,6 @@ bool IsComponentExtensionWhitelisted(int
  #endif
      case IDR_CRYPTOTOKEN_MANIFEST:
      case IDR_FEEDBACK_MANIFEST:
 -    case IDR_GAIA_AUTH_MANIFEST:
- #if defined(ENABLE_GOOGLE_NOW)
-     case IDR_GOOGLE_NOW_MANIFEST:
+ #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
+     case IDR_HANGOUT_SERVICES_MANIFEST:
  #endif
 --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
 +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
@@ -93,7 +93,7 @@
    source->AddLocalizedString(
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -323,7 +323,6 @@
+@@ -352,7 +352,6 @@
        <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
        <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
        <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
@@ -101,7 +101,7 @@
        <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
        <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
        <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
-@@ -453,7 +452,6 @@
+@@ -477,7 +476,6 @@
        </if>
        <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
        <include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />

resources/patches/ungoogled-chromium/disable-google-host-detection.patch

@@ -129,17 +129,20 @@
  
 --- a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.cc
 +++ b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.cc
-@@ -277,6 +277,7 @@ bool WasAbortedBeforeInteraction(
- // static
- bool FromGWSPageLoadMetricsLogger::IsGoogleSearchHostname(
-     base::StringPiece host) {
-+  return false;
-   const char kGoogleSearchHostnamePrefix[] = "www.";
+@@ -322,9 +322,7 @@ bool WasAbortedBeforeInteraction(
  
-   // Hostname must start with 'www.' Hostnames are not case sensitive.
+ // static
+ bool FromGWSPageLoadMetricsLogger::IsGoogleSearchHostname(const GURL& url) {
+-  base::Optional<std::string> result =
+-      page_load_metrics::GetGoogleHostnamePrefix(url);
+-  return result && result.value() == "www";
++  return false;
+ }
+ 
+ // static
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -439,11 +439,6 @@ base::string16 TemplateURLRef::SearchTer
+@@ -444,11 +444,6 @@ base::string16 TemplateURLRef::SearchTer
  bool TemplateURLRef::HasGoogleBaseURLs(
      const SearchTermsData& search_terms_data) const {
    ParseIfNecessary(search_terms_data);
@@ -153,7 +156,7 @@
  
 --- a/components/google/core/browser/google_util.cc
 +++ b/components/google/core/browser/google_util.cc
-@@ -41,87 +41,11 @@ namespace {
+@@ -41,120 +41,16 @@ namespace {
  
  bool gUseMockLinkDoctorBaseURLForTesting = false;
  
@@ -161,6 +164,12 @@
 -  return (path == "/") || (path == "/webhp");
 -}
 -
+-// Removes a single trailing dot if present in |host|.
+-void StripTrailingDot(base::StringPiece* host) {
+-  if (host->ends_with("."))
+-    host->remove_suffix(1);
+-}
+-
 -// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
 -// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check
 -// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD
@@ -220,10 +229,30 @@
 -  if (!IsValidHostName(canonical_host, "google", subdomain_permission, &tld))
 -    return false;
 -
+-  // Remove the trailing dot from tld if present, as for google domain it's the
+-  // same page.
+-  StripTrailingDot(&tld);
+-
 -  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_tlds,
 -                         ({GOOGLE_TLD_LIST}));
 -  return base::ContainsKey(google_tlds, tld.as_string());
 -}
+-
+-// True if |url| is a valid URL with a host that is in the static list of
+-// Google subdomains for google search, and an HTTP or HTTPS scheme. Requires
+-// |url| to use the standard port for its scheme (80 for HTTP, 443 for HTTPS).
+-bool IsGoogleSearchSubdomainUrl(const GURL& url) {
+-  if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS))
+-    return false;
+-
+-  base::StringPiece host(url.host_piece());
+-  StripTrailingDot(&host);
+-
+-  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_subdomains,
+-                         ({"ipv4.google.com", "ipv6.google.com"}));
+-
+-  return base::ContainsKey(google_subdomains, host.as_string());
+-}
 -
  }  // namespace
  
@@ -241,7 +270,15 @@
    return false;
  }
  
-@@ -142,38 +66,15 @@ std::string GetGoogleLocale(const std::s
+ GURL LinkDoctorBaseURL() {
+-  if (gUseMockLinkDoctorBaseURLForTesting)
+-    return GURL("http://mock.linkdoctor.url/for?testing");
+-  return GURL(LINKDOCTOR_SERVER_REQUEST_URL);
++  return GURL();
+ }
+ 
+ void SetMockLinkDoctorBaseURLForTesting() {
+@@ -168,119 +64,49 @@ std::string GetGoogleLocale(const std::s
  
  GURL AppendGoogleLocaleParam(const GURL& url,
                               const std::string& application_locale) {
@@ -252,10 +289,10 @@
  
  std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
 -  base::StringPiece google_hostname = google_homepage_url.host_piece();
+-  // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
+-  // like "google.com./". https://crbug.com/720295.
 -  const size_t last_dot = google_hostname.find_last_of('.');
--  if (last_dot == std::string::npos) {
--    NOTREACHED();
--  }
+-  DCHECK_NE(std::string::npos, last_dot);
 -  base::StringPiece country_code = google_hostname.substr(last_dot + 1);
 -  // Assume the com TLD implies the US.
 -  if (country_code == "com")
@@ -283,10 +320,14 @@
  }
  
  const GURL& CommandLineGoogleBaseURL() {
-@@ -185,70 +86,37 @@ const GURL& CommandLineGoogleBaseURL() {
-   std::string current_switch_value(
-       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-           switches::kGoogleBaseURL));
+-  // Unit tests may add command-line flags after the first call to this
+-  // function, so we don't simply initialize a static |base_url| directly and
+-  // then unconditionally return it.
+-  CR_DEFINE_STATIC_LOCAL(std::string, switch_value, ());
+-  CR_DEFINE_STATIC_LOCAL(GURL, base_url, ());
+-  std::string current_switch_value(
+-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+-          switches::kGoogleBaseURL));
 -  if (current_switch_value != switch_value) {
 -    switch_value = current_switch_value;
 -    base_url = url_formatter::FixupURL(switch_value, std::string());
@@ -323,8 +364,11 @@
  
  bool IsGoogleHomePageUrl(const GURL& url) {
 -  // First check to see if this has a Google domain.
--  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN, DISALLOW_NON_STANDARD_PORTS))
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
 -    return false;
+-  }
 -
 -  // Make sure the path is a known home page path.
 -  base::StringPiece path(url.path_piece());
@@ -335,8 +379,11 @@
  
  bool IsGoogleSearchUrl(const GURL& url) {
 -  // First check to see if this has a Google domain.
--  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN, DISALLOW_NON_STANDARD_PORTS))
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
 -    return false;
+-  }
 -
 -  // Make sure the path is a known search path.
 -  base::StringPiece path(url.path_piece());
@@ -361,3 +408,45 @@
  }
  
  }  // namespace google_util
+--- a/chrome/common/page_load_metrics/page_load_metrics_util.cc
++++ b/chrome/common/page_load_metrics/page_load_metrics_util.cc
+@@ -12,38 +12,7 @@
+ namespace page_load_metrics {
+ 
+ base::Optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
+-  const size_t registry_length =
+-      net::registry_controlled_domains::GetRegistryLength(
+-          url,
+-
+-          // Do not include unknown registries (registries that don't have any
+-          // matches in effective TLD names).
+-          net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+-
+-          // Do not include private registries, such as appspot.com. We don't
+-          // want to match URLs like www.google.appspot.com.
+-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+-
+-  const base::StringPiece hostname = url.host_piece();
+-  if (registry_length == 0 || registry_length == std::string::npos ||
+-      registry_length >= hostname.length()) {
+-    return base::Optional<std::string>();
+-  }
+-
+-  // Removes the tld and the preceding dot.
+-  const base::StringPiece hostname_minus_registry =
+-      hostname.substr(0, hostname.length() - (registry_length + 1));
+-
+-  if (hostname_minus_registry == "google")
+-    return std::string("");
+-
+-  if (!base::EndsWith(hostname_minus_registry, ".google",
+-                      base::CompareCase::INSENSITIVE_ASCII)) {
+-    return base::Optional<std::string>();
+-  }
+-
+-  return std::string(hostname_minus_registry.substr(
+-      0, hostname_minus_registry.length() - strlen(".google")));
++  return base::Optional<std::string>();
+ }
+ 
+ bool IsGoogleHostname(const GURL& url) {

resources/patches/ungoogled-chromium/disable-intranet-redirect-detector.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/intranet_redirect_detector.cc
 +++ b/chrome/browser/intranet_redirect_detector.cc
-@@ -70,9 +70,7 @@ void IntranetRedirectDetector::FinishSle
+@@ -72,9 +72,7 @@ void IntranetRedirectDetector::FinishSle
    fetchers_.clear();
    resulting_origins_.clear();
  

resources/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch

@@ -53,7 +53,7 @@
  }; /* namespace iridium */
 --- a/chrome/app/chrome_main.cc
 +++ b/chrome/app/chrome_main.cc
-@@ -55,7 +55,6 @@ int ChromeMain(int argc, const char** ar
+@@ -52,7 +52,6 @@ int ChromeMain(int argc, const char** ar
  #if !defined(CHROME_MULTIPLE_DLL_CHILD)
  static void trace_url_request(const std::string &caller, const GURL &url)
  {

resources/patches/ungoogled-chromium/disable-signin.patch

@@ -2,7 +2,7 @@
 
 --- a/components/signin/core/browser/signin_manager_base.cc
 +++ b/components/signin/core/browser/signin_manager_base.cc
-@@ -158,7 +158,7 @@ void SigninManagerBase::Initialize(PrefS
+@@ -159,7 +159,7 @@ void SigninManagerBase::Initialize(PrefS
  bool SigninManagerBase::IsInitialized() const { return initialized_; }
  
  bool SigninManagerBase::IsSigninAllowed() const {
@@ -26,7 +26,7 @@
  // Shows either the help app or the appropriate help page for |source|. If
  // |browser| is NULL and the help page is used (vs the app), the help page is
  // shown in the last active browser. If there is no such browser, a new browser
-@@ -407,6 +401,7 @@ void ShowSearchEngineSettings(Browser* b
+@@ -406,6 +400,7 @@ void ShowSearchEngineSettings(Browser* b
  #if !defined(OS_ANDROID)
  void ShowBrowserSignin(Browser* browser,
                         signin_metrics::AccessPoint access_point) {
@@ -34,7 +34,7 @@
    Profile* original_profile = browser->profile()->GetOriginalProfile();
    SigninManagerBase* manager =
        SigninManagerFactory::GetForProfile(original_profile);
-@@ -446,6 +441,7 @@ void ShowBrowserSignin(Browser* browser,
+@@ -445,6 +440,7 @@ void ShowBrowserSignin(Browser* browser,
              false));
      DCHECK_GT(browser->tab_strip_model()->count(), 0);
    }

resources/patches/ungoogled-chromium/disable-translate.patch

@@ -2,19 +2,18 @@
 
 --- a/components/translate/core/browser/translate_manager.cc
 +++ b/components/translate/core/browser/translate_manager.cc
-@@ -178,8 +178,7 @@ void TranslateManager::InitiateTranslati
+@@ -165,7 +165,7 @@ void TranslateManager::InitiateTranslati
+   if (net::NetworkChangeNotifier::IsOffline())
      return;
-   }
  
--  PrefService* prefs = translate_client_->GetPrefs();
--  if (!prefs->GetBoolean(prefs::kEnableTranslate)) {
+-  if (!ignore_missing_key_for_testing_ && !::google_apis::HasKeysConfigured()) {
 +  if (true) {
-     TranslateBrowserMetrics::ReportInitiationStatus(
-         TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_PREFS);
-     const std::string& locale =
+     // Without an API key, translate won't work, so don't offer to translate
+     // in the first place. Leave prefs::kEnableTranslate on, though, because
+     // that settings syncs and we don't want to turn off translate everywhere
 --- a/components/translate/content/renderer/translate_helper.cc
 +++ b/components/translate/content/renderer/translate_helper.cc
-@@ -71,7 +71,9 @@ TranslateHelper::TranslateHelper(content
+@@ -73,7 +73,9 @@ TranslateHelper::TranslateHelper(content
        world_id_(world_id),
        extension_scheme_(extension_scheme),
        binding_(this),

resources/patches/ungoogled-chromium/disable-untraceable-urls.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/plugins/plugins_resource_service.cc
 +++ b/chrome/browser/plugins/plugins_resource_service.cc
-@@ -24,9 +24,6 @@ const int kStartResourceFetchDelayMs = 6
+@@ -50,9 +50,6 @@ const int kStartResourceFetchDelayMs = 6
  // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
  const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
  
@@ -12,7 +12,7 @@
  GURL GetPluginsServerURL() {
    std::string filename;
  #if defined(OS_WIN)
-@@ -39,7 +36,7 @@ GURL GetPluginsServerURL() {
+@@ -67,7 +64,7 @@ GURL GetPluginsServerURL() {
  #error Unknown platform
  #endif
  
@@ -23,7 +23,7 @@
  }  // namespace
 --- a/chrome/browser/safe_browsing/client_side_model_loader.cc
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
-@@ -34,8 +34,6 @@ namespace safe_browsing {
+@@ -35,8 +35,6 @@ namespace safe_browsing {
  // Model Loader strings
  const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
  const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
@@ -32,7 +32,7 @@
  const char ModelLoader::kClientModelNamePattern[] =
      "client_model_v5%s_variation_%d.pb";
  const char ModelLoader::kClientModelFinchExperiment[] =
-@@ -88,7 +86,7 @@ ModelLoader::ModelLoader(base::Closure u
+@@ -89,7 +87,7 @@ ModelLoader::ModelLoader(base::Closure u
                           net::URLRequestContextGetter* request_context_getter,
                           bool is_extended_reporting)
      : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
@@ -41,7 +41,7 @@
        update_renderers_callback_(update_renderers_callback),
        request_context_getter_(request_context_getter),
        weak_factory_(this) {
-@@ -99,7 +97,7 @@ ModelLoader::ModelLoader(base::Closure u
+@@ -100,7 +98,7 @@ ModelLoader::ModelLoader(base::Closure u
  ModelLoader::ModelLoader(base::Closure update_renderers_callback,
                           const std::string& model_name)
      : name_(model_name),
@@ -52,14 +52,14 @@
        weak_factory_(this) {
 --- a/chrome/browser/safe_browsing/client_side_model_loader.h
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.h
-@@ -46,7 +46,6 @@ class ModelLoader : public net::URLFetch
+@@ -43,7 +43,6 @@ class ModelLoader : public net::URLFetch
    static const int kClientModelFetchIntervalMs;
    static const char kClientModelFinchExperiment[];
    static const char kClientModelFinchParam[];
 -  static const char kClientModelUrlPrefix[];
    static const char kClientModelNamePattern[];
  
-   ModelLoader(base::Closure update_renderers,
+   // Constructs a model loader to fetch a model using |request_context_getter|.
 --- a/rlz/lib/lib_values.cc
 +++ b/rlz/lib/lib_values.cc
 @@ -41,7 +41,6 @@ const char kSetDccResponseVariable[] = "
@@ -82,7 +82,7 @@
  
 --- a/rlz/lib/financial_ping.cc
 +++ b/rlz/lib/financial_ping.cc
-@@ -254,7 +254,7 @@ bool FinancialPing::PingServer(const cha
+@@ -255,7 +255,7 @@ bool FinancialPing::PingServer(const cha
  
    // Open network connection.
    InternetHandle connection_handle = InternetConnectA(inet_handle,
@@ -91,7 +91,7 @@
        INTERNET_FLAG_NO_CACHE_WRITE, 0);
    if (!connection_handle)
      return false;
-@@ -315,7 +315,7 @@ bool FinancialPing::PingServer(const cha
+@@ -316,7 +316,7 @@ bool FinancialPing::PingServer(const cha
    FinancialPingUrlFetcherDelegate delegate(loop.QuitClosure());
  
    std::string url = base::StringPrintf("http://%s:%d%s",
@@ -99,4 +99,4 @@
 +                                       "about:blank", kFinancialPort,
                                         request);
  
-   std::unique_ptr<net::URLFetcher> fetcher =
+   net::NetworkTrafficAnnotationTag traffic_annotation =

resources/patches/ungoogled-chromium/disable-webstore-urls.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
 +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
-@@ -152,13 +152,7 @@ ContentVerifierDelegate::Mode ChromeCont
+@@ -132,13 +132,7 @@ ContentVerifierDelegate::Mode ChromeCont
      return ContentVerifierDelegate::NONE;
  
    if (!ManifestURL::UpdatesFromGallery(&extension)) {
@@ -33,7 +33,7 @@
    extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get();
 --- a/extensions/browser/updater/extension_downloader.cc
 +++ b/extensions/browser/updater/extension_downloader.cc
-@@ -87,27 +87,18 @@ const char kNotFromWebstoreInstallSource
+@@ -90,27 +90,18 @@ const char kNotFromWebstoreInstallSource
  const char kDefaultInstallSource[] = "";
  const char kReinstallInstallSource[] = "reinstall";
  
@@ -63,23 +63,25 @@
  
  bool ShouldRetryRequest(const net::URLRequestStatus& status,
                          int response_code) {
-@@ -272,15 +263,6 @@ void ExtensionDownloader::StartBlacklist
+@@ -288,17 +279,6 @@ void ExtensionDownloader::StartBlacklist
      const std::string& version,
      const ManifestFetchData::PingData& ping_data,
      int request_id) {
 -  // Note: it is very important that we use the https version of the update
 -  // url here to avoid DNS hijacking of the blacklist, which is not validated
 -  // by a public key signature like .crx files are.
--  std::unique_ptr<ManifestFetchData> blacklist_fetch(CreateManifestFetchData(
--      extension_urls::GetWebstoreUpdateUrl(), request_id));
+-  std::unique_ptr<ManifestFetchData> blacklist_fetch(
+-      CreateManifestFetchData(extension_urls::GetWebstoreUpdateUrl(),
+-                              request_id, ManifestFetchData::BACKGROUND));
 -  DCHECK(blacklist_fetch->base_url().SchemeIsCryptographic());
 -  blacklist_fetch->AddExtension(kBlacklistAppID, version, &ping_data,
--                                std::string(), kDefaultInstallSource);
+-                                std::string(), kDefaultInstallSource,
+-                                ManifestFetchData::FetchPriority::BACKGROUND);
 -  StartUpdateCheck(std::move(blacklist_fetch));
  }
  
  void ExtensionDownloader::SetWebstoreIdentityProvider(
-@@ -308,23 +290,16 @@ bool ExtensionDownloader::AddExtensionDa
+@@ -328,23 +308,16 @@ bool ExtensionDownloader::AddExtensionDa
      return false;
    }
  
@@ -105,7 +107,7 @@
    } else {
      url_stats_.other_url_count++;
    }
-@@ -589,23 +564,6 @@ void ExtensionDownloader::HandleManifest
+@@ -656,23 +629,6 @@ void ExtensionDownloader::HandleManifest
      FetchUpdatedExtension(std::move(fetch));
    }
  
@@ -129,7 +131,7 @@
    NotifyExtensionsDownloadFailed(
        not_updated, fetch_data->request_ids(),
        ExtensionDownloaderDelegate::NO_UPDATE_AVAILABLE);
-@@ -884,11 +842,7 @@ bool ExtensionDownloader::IterateFetchCr
+@@ -982,11 +938,7 @@ bool ExtensionDownloader::IterateFetchCr
    // fetch.
    switch (fetch->credentials) {
      case ExtensionFetch::CREDENTIALS_NONE:

resources/patches/ungoogled-chromium/enable-page-saving-on-more-pages.patch

@@ -17,7 +17,7 @@
  }  // namespace content
 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -349,12 +349,6 @@ int GetContentRestrictions(const Browser
+@@ -346,12 +346,6 @@ int GetContentRestrictions(const Browser
      CoreTabHelper* core_tab_helper =
          CoreTabHelper::FromWebContents(current_tab);
      content_restrictions = core_tab_helper->content_restrictions();
@@ -30,7 +30,7 @@
      if (current_tab->ShowingInterstitialPage())
        content_restrictions |= CONTENT_RESTRICTION_PRINT;
    }
-@@ -888,8 +882,7 @@ bool CanSavePage(const Browser* browser)
+@@ -897,8 +891,7 @@ bool CanSavePage(const Browser* browser)
        prefs::kAllowFileSelectionDialogs)) {
      return false;
    }

resources/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
 +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
-@@ -375,6 +375,7 @@ void OneClickSigninSyncStarter::CancelSi
+@@ -374,6 +374,7 @@ void OneClickSigninSyncStarter::CancelSi
  }
  
  void OneClickSigninSyncStarter::ConfirmAndSignin() {
@@ -10,7 +10,7 @@
    SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
    if (confirmation_required_ == CONFIRM_UNTRUSTED_SIGNIN) {
      browser_ = EnsureBrowser(browser_, profile_);
-@@ -389,6 +390,7 @@ void OneClickSigninSyncStarter::ConfirmA
+@@ -388,6 +389,7 @@ void OneClickSigninSyncStarter::ConfirmA
      // No confirmation required - just sign in the user.
      signin->CompletePendingSignin();
    }
@@ -36,7 +36,7 @@
  }
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1583,8 +1583,6 @@ split_static_library("ui") {
+@@ -1637,8 +1637,6 @@ split_static_library("ui") {
          "views/profiles/profile_chooser_view.cc",
          "views/profiles/profile_chooser_view.h",
          "views/screen_capture_notification_ui_views.cc",
@@ -45,7 +45,7 @@
        ]
      }
  
-@@ -2831,10 +2829,6 @@ split_static_library("ui") {
+@@ -2886,10 +2884,6 @@ split_static_library("ui") {
          "cocoa/omnibox/omnibox_view_mac.mm",
          "cocoa/omnibox_decoration_bubble_controller.h",
          "cocoa/omnibox_decoration_bubble_controller.mm",
@@ -53,6 +53,6 @@
 -        "cocoa/one_click_signin_dialog_controller.mm",
 -        "cocoa/one_click_signin_view_controller.h",
 -        "cocoa/one_click_signin_view_controller.mm",
-         "cocoa/passwords/account_avatar_fetcher_manager.h",
-         "cocoa/passwords/account_avatar_fetcher_manager.mm",
-         "cocoa/passwords/account_chooser_view_controller.h",
+         "cocoa/page_info/page_info_bubble_controller.h",
+         "cocoa/page_info/page_info_bubble_controller.mm",
+         "cocoa/page_info/page_info_utils_cocoa.h",

resources/patches/ungoogled-chromium/gn-modify-hardcoded-settings.patch

@@ -1,17 +1,2 @@
 # Modify other miscellaneous hardcoded settings
 
---- a/build/config/features.gni
-+++ b/build/config/features.gni
-@@ -76,7 +76,6 @@ declare_args() {
-   # TODO(bshe): Enable for other architecture too. Currently we only support arm
-   # and arm64.
-   enable_webvr = is_android && (current_cpu == "arm" || current_cpu == "arm64")
--}
- 
- # Additional dependent variables -----------------------------------------------
- 
-@@ -89,3 +88,4 @@ enable_chromevox_next = false
- # =============================================
- #
- # See comment at the top.
-+}

resources/patches/ungoogled-chromium/intercept-all-modified-domains.patch

@@ -10,7 +10,7 @@
  #endif
  
  #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
-@@ -55,11 +56,13 @@ int ChromeMain(int argc, const char** ar
+@@ -52,11 +53,13 @@ int ChromeMain(int argc, const char** ar
  #if !defined(CHROME_MULTIPLE_DLL_CHILD)
  static void trace_url_request(const std::string &caller, const GURL &url)
  {
@@ -46,7 +46,7 @@
  	*url = url->strip_trk();
 --- a/url/gurl.cc
 +++ b/url/gurl.cc
-@@ -516,7 +516,7 @@ bool gurl_is_trq(const std::string &s)
+@@ -546,7 +546,7 @@ bool gurl_is_trq(const std::string &s)
  
  GURL GURL::strip_trk(void) const
  {

resources/patches/ungoogled-chromium/popups-to-tabs.patch

@@ -2,10 +2,10 @@
 
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -317,7 +317,7 @@ WindowOpenDisposition RenderViewImpl::Na
-     case blink::WebNavigationPolicyNewWindow:
+@@ -312,7 +312,7 @@ WindowOpenDisposition RenderViewImpl::Na
+     case blink::kWebNavigationPolicyNewWindow:
        return WindowOpenDisposition::NEW_WINDOW;
-     case blink::WebNavigationPolicyNewPopup:
+     case blink::kWebNavigationPolicyNewPopup:
 -      return WindowOpenDisposition::NEW_POPUP;
 +      return WindowOpenDisposition::NEW_FOREGROUND_TAB;
    default:
@@ -13,7 +13,7 @@
      return WindowOpenDisposition::IGNORE_ACTION;
 --- a/chrome/browser/ui/views/frame/browser_view.cc
 +++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -1447,7 +1447,7 @@ void BrowserView::CutCopyPaste(int comma
+@@ -1464,7 +1464,7 @@ void BrowserView::CutCopyPaste(int comma
  
  WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
      const gfx::Rect& bounds) {

resources/patches/ungoogled-chromium/prevent-trace-url-requests.patch

@@ -2,7 +2,7 @@
 
 --- a/url/gurl.cc
 +++ b/url/gurl.cc
-@@ -504,15 +504,7 @@ size_t GURL::EstimateMemoryUsage() const
+@@ -534,15 +534,7 @@ size_t GURL::EstimateMemoryUsage() const
  
  std::string &gurl_strip_trk(std::string &s)
  {
@@ -21,7 +21,7 @@
  bool gurl_is_trq(const std::string &s)
 --- a/chrome/browser/ui/browser_navigator.cc
 +++ b/chrome/browser/ui/browser_navigator.cc
-@@ -637,10 +637,7 @@ bool IsURLAllowedInIncognito(const GURL&
+@@ -640,10 +640,7 @@ bool IsURLAllowedInIncognito(const GURL&
    }
  
  	if (url.SchemeIs(url::kTraceScheme)) {