Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 10 deletions

diff --git a/toolkit/components/glean/xpcom/FOG.cpp b/toolkit/components/glean/xpcom/FOG.cpp
index d4c03a5b9e..955f2511b6 100644
--- a/toolkit/components/glean/xpcom/FOG.cpp
+++ b/toolkit/components/glean/xpcom/FOG.cpp
@@ -95,7 +95,7 @@ already_AddRefed<FOG> FOG::GetSingleton() {
             glean::fog::inits_during_shutdown.Add(1);
             // It's enough to call init before shutting down.
             // We don't need to (and can't) wait for it to complete.
-            glean::impl::fog_init(&VoidCString(), &VoidCString());
+            glean::impl::fog_init(&VoidCString(), &VoidCString(), false);
           }
           gFOG->Shutdown();
           gFOG = nullptr;
@@ -123,19 +123,13 @@ extern "C" uint32_t FOG_MaxPingLimit(void) {
                                 "gleanMaxPingsPerMinute"_ns, 15);
 }
 
-// This allows us to pass whether to enable precise event timestamps to Rust.
-// Default is false.
-extern "C" bool FOG_EventTimestampsEnabled(void) {
-  return NimbusFeatures::GetBool("gleanInternalSdk"_ns,
-                                 "enableEventTimestamps"_ns, false);
-}
-
 // Called when knowing if we're in automation is necessary.
 extern "C" bool FOG_IPCIsInAutomation(void) { return xpc::IsInAutomation(); }
 
 NS_IMETHODIMP
 FOG::InitializeFOG(const nsACString& aDataPathOverride,
-                   const nsACString& aAppIdOverride) {
+                   const nsACString& aAppIdOverride,
+                   const bool aDisableInternalPings) {
   MOZ_ASSERT(XRE_IsParentProcess());
   gInitializeCalled = true;
   RunOnShutdown(
@@ -147,7 +141,8 @@ FOG::InitializeFOG(const nsACString& aDataPathOverride,
       },
       ShutdownPhase::AppShutdownConfirmed);
 
-  return glean::impl::fog_init(&aDataPathOverride, &aAppIdOverride);
+  return glean::impl::fog_init(&aDataPathOverride, &aAppIdOverride,
+                               aDisableInternalPings);
 }
 
 NS_IMETHODIMP