6 files changed, 8 insertions, 22 deletions
diff --git a/xpcom/base/nsIMemoryReporter.idl b/xpcom/base/nsIMemoryReporter.idl
index c5177cd542..5e2c079db5 100644
--- a/xpcom/base/nsIMemoryReporter.idl
+++ b/xpcom/base/nsIMemoryReporter.idl
@@ -158,8 +158,7 @@ interface nsIMemoryReporter : nsISupports
    *
    * If |anonymize| is true, the memory reporter should anonymize any
    * privacy-sensitive details in memory report paths, by replacing them with a
-   * string such as "<anonymized>". Anonymized memory reports may be sent
-   * automatically via crash reports or telemetry.
+   * string such as "<anonymized>".
    *
    * The following things are considered privacy-sensitive.
    *
@@ -312,8 +311,7 @@ interface nsIMemoryReporterManager : nsISupports
    * registered with it as a black box.  However, there are some
    * "distinguished" amounts (as could be reported by a memory reporter) that
    * the manager provides as attributes, because they are sufficiently
-   * interesting that we want external code (e.g. telemetry) to be able to rely
-   * on them.
+   * interesting that we want external code to be able to rely on them.
    *
    * Note that these are not reporters and so getReports() does not look at
    * them.  However, distinguished amounts can be embedded in a reporter.
diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h
index 78760f0431..18ccca4158 100644
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -487,9 +487,6 @@ XRE_API(void,
         XRE_InstallX11ErrorHandler, ())
 
 XRE_API(void,
-        XRE_TelemetryAccumulate, (int aID, uint32_t aSample))
-
-XRE_API(void,
         XRE_StartupTimelineRecord, (int aEvent, mozilla::TimeStamp aWhen))
 
 XRE_API(void,
diff --git a/xpcom/glue/FileUtils.h b/xpcom/glue/FileUtils.h
index d8688ae82f..14e386ecc6 100644
--- a/xpcom/glue/FileUtils.h
+++ b/xpcom/glue/FileUtils.h
@@ -96,7 +96,7 @@ bool fallocate(PRFileDesc* aFD, int64_t aLength);
 
 /**
  * Use readahead to preload shared libraries into the file cache before loading.
- * WARNING: This function should not be used without a telemetry field trial
+ * WARNING: This function should not be used without a field trial
  *          demonstrating a clear performance improvement!
  *
  * @param aFile nsIFile representing path to shared library
@@ -105,7 +105,7 @@ void ReadAheadLib(nsIFile* aFile);
 
 /**
  * Use readahead to preload a file into the file cache before reading.
- * WARNING: This function should not be used without a telemetry field trial
+ * WARNING: This function should not be used without a field trial
  *          demonstrating a clear performance improvement!
  *
  * @param aFile nsIFile representing path to shared library
@@ -122,7 +122,7 @@ void ReadAheadFile(nsIFile* aFile, const size_t aOffset = 0,
 
 /**
  * Use readahead to preload shared libraries into the file cache before loading.
- * WARNING: This function should not be used without a telemetry field trial
+ * WARNING: This function should not be used without a field trial
  *          demonstrating a clear performance improvement!
  *
  * @param aFilePath path to shared library
@@ -131,7 +131,7 @@ void ReadAheadLib(pathstr_t aFilePath);
 
 /**
  * Use readahead to preload a file into the file cache before loading.
- * WARNING: This function should not be used without a telemetry field trial
+ * WARNING: This function should not be used without a field trial
  *          demonstrating a clear performance improvement!
  *
  * @param aFilePath path to shared library
@@ -148,7 +148,7 @@ void ReadAheadFile(pathstr_t aFilePath, const size_t aOffset = 0,
  * Use readahead to preload a file into the file cache before reading.
  * When this function exits, the file pointer is guaranteed to be in the same
  * position it was in before this function was called.
- * WARNING: This function should not be used without a telemetry field trial
+ * WARNING: This function should not be used without a field trial
  *          demonstrating a clear performance improvement!
  *
  * @param aFd file descriptor opened for read access
diff --git a/xpcom/system/nsICrashReporter.idl b/xpcom/system/nsICrashReporter.idl
index c2f590098c..160c3f9323 100644
--- a/xpcom/system/nsICrashReporter.idl
+++ b/xpcom/system/nsICrashReporter.idl
@@ -125,11 +125,4 @@ interface nsICrashReporter : nsISupports
    * @throws NS_ERROR_NOT_INITIALIZED if crash reporting is disabled.
    */
   void saveMemoryReport();
-
-  /**
-   * Set the telemetry session ID which is recorded in crash metadata. This is
-   * saved in the crash manager and telemetry but is not submitted as a
-   * crash-stats annotation.
-   */
-  void setTelemetrySessionId(in AUTF8String id);
 };
diff --git a/xpcom/tests/TestHarness.h b/xpcom/tests/TestHarness.h
index 753e0233a0..e0322af325 100644
--- a/xpcom/tests/TestHarness.h
+++ b/xpcom/tests/TestHarness.h
@@ -105,7 +105,6 @@ class ScopedXPCOM : public nsIDirectoryServiceProvider2
         MOZ_ALWAYS_SUCCEEDS(os->NotifyObservers(nullptr, "profile-change-teardown", nullptr));
         MOZ_ALWAYS_SUCCEEDS(os->NotifyObservers(nullptr, "profile-before-change", nullptr));
         MOZ_ALWAYS_SUCCEEDS(os->NotifyObservers(nullptr, "profile-before-change-qm", nullptr));
-        MOZ_ALWAYS_SUCCEEDS(os->NotifyObservers(nullptr, "profile-before-change-telemetry", nullptr));
 
         if (NS_FAILED(mProfD->Remove(true))) {
           NS_WARNING("Problem removing profile directory");
diff --git a/xpcom/threads/HangAnnotations.cpp b/xpcom/threads/HangAnnotations.cpp
index 598da351f9..9e5a890ba6 100644
--- a/xpcom/threads/HangAnnotations.cpp
+++ b/xpcom/threads/HangAnnotations.cpp
@@ -97,8 +97,7 @@ BrowserHangAnnotations::AddAnnotation(const nsAString& aName, const bool aData)
 
 /**
  * This class itself does not use synchronization but it (and its parent object)
- * should be protected by mutual exclusion in some way. In Telemetry the chrome
- * hang data is protected via TelemetryImpl::mHangReportsMutex.
+ * should be protected by mutual exclusion in some way.
  */
 class ChromeHangAnnotationEnumerator : public HangAnnotations::Enumerator
 {