Merge pull request #929 from adeshkp/remove-telemetry-stubs

Telemetry: Remove stubs and related code

1 files changed, 4 insertions, 5 deletions

diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index 848dd25b1..f1ec0f947 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -105,8 +105,10 @@ public:
     bool           EnforceAssocReq()         { return mEnforceAssocReq; }
 
     bool           IsPersistentHttpsCachingEnabled() { return mEnablePersistentHttpsCaching; }
-    bool           IsTelemetryEnabled() { return mTelemetryEnabled; }
-    bool           AllowExperiments() { return mTelemetryEnabled && mAllowExperiments; }
+
+    // Since telemetry has been removed, experiments should also not be allowed.
+    // Making this function return `false` for now, it will be cleaned up later.
+    bool           AllowExperiments() { return false; }
 
     bool           IsSpdyEnabled() { return mEnableSpdy; }
     bool           IsHttp2Enabled() { return mHttp2Enabled; }
@@ -509,9 +511,6 @@ private:
     // true in between init and shutdown states
     Atomic<bool, Relaxed> mHandlerActive;
 
-    // Whether telemetry is reported or not
-    uint32_t           mTelemetryEnabled : 1;
-
     // The value of network.allow-experiments
     uint32_t           mAllowExperiments : 1;