ungoogled-chromium/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch

# Add flag to disable automatic search engine collection

--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1211,6 +1211,10 @@ const FeatureEntry kFeatureEntries[] = {
      "Enable stacking in tab strip",
      "Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
      kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
+    {"disable-search-engine-collection",
+     "Disable search engine collection",
+     "Prevents search engines from being added automatically.",
+     kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
     {"ignore-gpu-blacklist", flag_descriptions::kIgnoreGpuBlacklistName,
      flag_descriptions::kIgnoreGpuBlacklistDescription, kOsAll,
      SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -151,9 +151,10 @@ ChromeRenderFrameObserver::ChromeRenderF
   if (!render_frame->IsMainFrame())
     return;
 
-#if defined(SAFE_BROWSING_CSD)
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
+  should_autocollect_ = !command_line.HasSwitch("disable-search-engine-collection");
+#if defined(SAFE_BROWSING_CSD)
   if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
     SetClientSidePhishingDetection(true);
 #endif
@@ -340,14 +341,16 @@ void ChromeRenderFrameObserver::DidFinis
   if (frame->Parent())
     return;
 
-  GURL osdd_url = frame->GetDocument().OpenSearchDescriptionURL();
-  if (!osdd_url.is_empty()) {
-    chrome::mojom::OpenSearchDescriptionDocumentHandlerAssociatedPtr
-        osdd_handler;
-    render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
-        &osdd_handler);
-    osdd_handler->PageHasOpenSearchDescriptionDocument(
-        frame->GetDocument().Url(), osdd_url);
+  if (should_autocollect_) {
+    GURL osdd_url = frame->GetDocument().OpenSearchDescriptionURL();
+    if (!osdd_url.is_empty()) {
+      chrome::mojom::OpenSearchDescriptionDocumentHandlerAssociatedPtr
+          osdd_handler;
+      render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
+          &osdd_handler);
+      osdd_handler->PageHasOpenSearchDescriptionDocument(
+          frame->GetDocument().Url(), osdd_url);
+    }
   }
 }
 
--- a/chrome/renderer/chrome_render_frame_observer.h
+++ b/chrome/renderer/chrome_render_frame_observer.h
@@ -109,6 +109,7 @@ class ChromeRenderFrameObserver : public
   // Have the same lifetime as us.
   translate::TranslateHelper* translate_helper_;
   safe_browsing::PhishingClassifierDelegate* phishing_classifier_;
+  bool should_autocollect_; // Whether to autocollect search engines
 
   // Owned by ChromeContentRendererClient and outlive us.
   web_cache::WebCacheImpl* web_cache_impl_;
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -9,6 +9,7 @@
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/format_macros.h"
 #include "base/metrics/histogram_macros.h"
@@ -200,6 +201,12 @@ bool IsCreatedByExtension(const Template
          template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
 }
 
+bool ShouldAutocollect() {
+  const base::CommandLine& command_line =
+    *base::CommandLine::ForCurrentProcess();
+  return !command_line.HasSwitch("disable-search-engine-collection");
+}
+
 }  // namespace
 
 // TemplateURLService::LessWithPrefix -----------------------------------------
@@ -286,6 +293,7 @@ TemplateURLService::TemplateURLService(
     rappor::RapporServiceImpl* rappor_service,
     const base::Closure& dsp_change_callback)
     : prefs_(prefs),
+      should_autocollect_(true),
       search_terms_data_(std::move(search_terms_data)),
       web_data_service_(web_data_service),
       client_(std::move(client)),
@@ -351,7 +359,7 @@ bool TemplateURLService::CanAddAutogener
   if (existing_url) {
     // We already have a TemplateURL for this keyword. Only allow it to be
     // replaced if the TemplateURL can be replaced.
-    return CanReplace(existing_url);
+    return should_autocollect_ && CanReplace(existing_url);
   }
 
   // We don't have a TemplateURL with keyword.  We still may not allow this
@@ -360,8 +368,8 @@ bool TemplateURLService::CanAddAutogener
   // that may interfere with search queries).  An easy heuristic for this is
   // whether the user has a TemplateURL that has been manually modified (e.g.,
   // renamed) connected to the same host.
-  return !url.is_valid() || url.host().empty() ||
-      CanAddAutogeneratedKeywordForHost(url.host());
+  return should_autocollect_ && (!url.is_valid() || url.host().empty() ||
+      CanAddAutogeneratedKeywordForHost(url.host()));
 }
 
 bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
@@ -1383,6 +1391,8 @@ SyncDataMap TemplateURLService::CreateGU
 
 void TemplateURLService::Init(const Initializer* initializers,
                               int num_initializers) {
+  should_autocollect_ = ShouldAutocollect();
+
   if (client_)
     client_->SetOwner(this);
 
@@ -1618,6 +1628,9 @@ void TemplateURLService::ChangeToLoadedS
 
 bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
     const std::string& host) const {
+  if (!should_autocollect_)
+    return false;
+
   const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
   if (!urls)
     return true;
@@ -1628,7 +1641,8 @@ bool TemplateURLService::CanAddAutogener
 }
 
 bool TemplateURLService::CanReplace(const TemplateURL* t_url) const {
-  return !ShowInDefaultList(t_url) && t_url->safe_for_autoreplace();
+  return should_autocollect_ && !ShowInDefaultList(t_url) &&
+      t_url->safe_for_autoreplace();
 }
 
 TemplateURL* TemplateURLService::FindNonExtensionTemplateURLForKeyword(
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -733,6 +733,8 @@ class TemplateURLService : public WebDat
   // ---------- Browser state related members ---------------------------------
   PrefService* prefs_ = nullptr;
 
+  bool should_autocollect_; // Whether search engines should be auto-collected
+
   std::unique_ptr<SearchTermsData> search_terms_data_ =
       std::make_unique<SearchTermsData>();