From ba5cb88a64a39c41e8a3e5f41297cc3209d0b41d Mon Sep 17 00:00:00 2001
From: Alex Catarineu <acat@torproject.org>
Date: Wed, 10 Apr 2019 17:52:51 +0200
Subject: [PATCH] Bug 28369: Stop shipping pingsender executable

---
 browser/app/macbuild/Contents/MacOS-files.in  |  1 -
 browser/installer/package-manifest.in         |  4 ----
 browser/installer/windows/nsis/shared.nsh     |  1 -
 python/mozbuild/mozbuild/artifacts.py         |  2 --
 .../telemetry/app/TelemetrySend.jsm           | 20 ++-----------------
 toolkit/components/telemetry/moz.build        |  1 -
 6 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in
index 3dac37a298b92..c54e3257cc50d 100644
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/browser/app/macbuild/Contents/MacOS-files.in
@@ -10,7 +10,6 @@
 #if defined(MOZ_ASAN) || defined(MOZ_TSAN)
 /llvm-symbolizer
 #endif
-/pingsender
 /pk12util
 /ssltunnel
 /webrtc-gtest
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 9376653239a32..12953b0ab0e46 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -435,10 +435,6 @@ bin/libfreebl_32int64_3.so
 #endif
 #endif
 
-; [ Ping Sender ]
-;
-@BINPATH@/pingsender@BIN_SUFFIX@
-
 ; Shutdown Terminator
 @RESPATH@/components/terminator.manifest
 
diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
index a6599267116cf..f229af8adfe82 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -1351,7 +1351,6 @@
   Push "xpcom.dll"
   Push "crashreporter.exe"
   Push "minidump-analyzer.exe"
-  Push "pingsender.exe"
   Push "updater.exe"
   Push "${FileMainEXE}"
 !macroend
diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py
index 4ec9db1a420f1..ee020413632b3 100644
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -366,7 +366,6 @@ class LinuxArtifactJob(ArtifactJob):
         '{product}/{product}',
         '{product}/{product}-bin',
         '{product}/minidump-analyzer',
-        '{product}/pingsender',
         '{product}/platform.ini',
         '{product}/plugin-container',
         '{product}/updater',
@@ -426,7 +425,6 @@ class MacArtifactJob(ArtifactJob):
         'libmozavutil.dylib',
         'libmozavcodec.dylib',
         'libsoftokn3.dylib',
-        'pingsender',
         'plugin-container.app/Contents/MacOS/plugin-container',
         'updater.app/Contents/MacOS/org.mozilla.updater',
         # 'xpcshell',
diff --git a/toolkit/components/telemetry/app/TelemetrySend.jsm b/toolkit/components/telemetry/app/TelemetrySend.jsm
index 9d5131058f2d9..1cd418b6209be 100644
--- a/toolkit/components/telemetry/app/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/app/TelemetrySend.jsm
@@ -1556,23 +1556,7 @@ var TelemetrySendImpl = {
     };
   },
 
-  runPingSender(url, pingPath, observer) {
-    if (AppConstants.platform === "android") {
-      throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    const exeName =
-      AppConstants.platform === "win" ? "pingsender.exe" : "pingsender";
-
-    let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile);
-    exe.append(exeName);
-
-    let process = Cc["@mozilla.org/process/util;1"].createInstance(
-      Ci.nsIProcess
-    );
-    process.init(exe);
-    process.startHidden = true;
-    process.noShell = true;
-    process.runAsync([url, pingPath], 2, observer);
+  runPingSender(url, pingPath) {
+    throw Cr.NS_ERROR_NOT_IMPLEMENTED;
   },
 };
diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build
index a364939b40af3..82ee5e37c1abd 100644
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -12,7 +12,6 @@ FINAL_LIBRARY = 'xul'
 
 DIRS = [
     'hybrid-content',
-    'pingsender',
 ]
 
 DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION']
-- 
GitLab