From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 2 Jun 2015 11:01:50 +0200
Subject: updater: disable updater pings

Despite auto-updater being arguably disabled (see previous commit),
Chromium would still send background requests. Kill it.
(trk:170, trk:171)
---
 components/component_updater/component_updater_url_constants.cc | 4 ++--
 components/component_updater/configurator_impl.cc               | 5 +----
 components/component_updater/configurator_impl.h                | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/components/component_updater/component_updater_url_constants.cc b/components/component_updater/component_updater_url_constants.cc
--- a/components/component_updater/component_updater_url_constants.cc
+++ b/components/component_updater/component_updater_url_constants.cc
@@ -15,10 +15,10 @@ namespace component_updater {
 // The value of |kDefaultUrlSource| can be overridden with
 // --component-updater=url-source=someurl.
 const char kUpdaterDefaultUrl[] =
-    "https://update.googleapis.com/service/update2";
+    "about:blank";
 
 const char kUpdaterFallbackUrl[] =
-    "http://update.googleapis.com/service/update2";
+    "about:blank";
 
 const char kUpdaterJSONDefaultUrl[] =
     "https://update.googleapis.com/service/update2/json";
diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
--- a/components/component_updater/configurator_impl.cc
+++ b/components/component_updater/configurator_impl.cc
@@ -49,8 +49,7 @@ ConfiguratorImpl::ConfiguratorImpl(
     : background_downloads_enabled_(config_policy.BackgroundDownloadsEnabled()),
       deltas_enabled_(config_policy.DeltaUpdatesEnabled()),
       fast_update_(config_policy.FastUpdate()),
-      pings_enabled_(config_policy.PingsEnabled()),
-      require_encryption_(require_encryption),
+      pings_enabled_(false),
       url_source_override_(config_policy.UrlSourceOverride()),
       initial_delay_(config_policy.InitialDelay()) {
   if (config_policy.TestRequest()) {
@@ -89,8 +88,6 @@ std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
                               GURL(kUpdaterJSONFallbackUrl)}
           : std::vector<GURL>{GURL(kUpdaterDefaultUrl),
                               GURL(kUpdaterFallbackUrl)};
-  if (require_encryption_)
-    update_client::RemoveUnsecureUrls(&urls);
 
   return urls;
 }
diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h
--- a/components/component_updater/configurator_impl.h
+++ b/components/component_updater/configurator_impl.h
@@ -105,7 +105,6 @@ class ConfiguratorImpl {
   const bool deltas_enabled_;
   const bool fast_update_;
   const bool pings_enabled_;
-  const bool require_encryption_;
   const GURL url_source_override_;
   const int initial_delay_;
 
-- 
2.11.0

