From f2b21bebd20d8b17974def3a4cfc3245e31eda9c Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Fri, 22 Aug 2014 09:28:38 +0100
Subject: [PATCH] Backed out changeset f2da252a9248 (bug 1054630)

---
 js/src/frontend/Parser.cpp                   | 23 --------------------
 js/src/frontend/Parser.h                     |  2 --
 js/src/jsfriendapi.h                         |  3 +--
 js/xpconnect/src/XPCJSRuntime.cpp            |  5 -----
 toolkit/components/telemetry/Histograms.json |  6 -----
 5 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 6e6fda4410a7..4cdc38594241 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -449,8 +449,6 @@ Parser<ParseHandler>::Parser(ExclusiveContext *cx, LifoAlloc *alloc,
 template <typename ParseHandler>
 Parser<ParseHandler>::~Parser()
 {
-    accumulateTelemetry();
-
     alloc.release(tempPoolMark);
 
     /*
@@ -7569,27 +7567,6 @@ Parser<ParseHandler>::exprInParens()
     return pn;
 }
 
-template <typename ParseHandler>
-void
-Parser<ParseHandler>::accumulateTelemetry()
-{
-    JSContext* cx = context->maybeJSContext();
-    if (!cx)
-        return;
-    JSAccumulateTelemetryDataCallback cb = cx->runtime()->telemetryCallback;
-    if (!cb)
-        return;
-
-    const char* filename = getFilename();
-    bool isHTTP = strncmp(filename, "http://", 7) == 0 || strncmp(filename, "https://", 8) == 0;
-
-    // Only report telemetry for web content, not add-ons or chrome JS.
-    if (!isHTTP)
-        return;
-
-    // Call back into Firefox's Telemetry reporter.
-}
-
 template class Parser<FullParseHandler>;
 template class Parser<SyntaxParseHandler>;
 
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index ba4272741b44..fb1f759a14d4 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -658,8 +658,6 @@ class Parser : private JS::AutoGCRooter, public StrictModeGetter
 
     bool asmJS(Node list);
 
-    void accumulateTelemetry();
-
     friend class LegacyCompExprTransplanter;
     friend struct BindData<ParseHandler>;
 };
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index 547dea6706c1..e175b33b403e 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -119,8 +119,7 @@ enum {
     JS_TELEMETRY_GC_INCREMENTAL_DISABLED,
     JS_TELEMETRY_GC_NON_INCREMENTAL,
     JS_TELEMETRY_GC_SCC_SWEEP_TOTAL_MS,
-    JS_TELEMETRY_GC_SCC_SWEEP_MAX_PAUSE_MS,
-    JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT
+    JS_TELEMETRY_GC_SCC_SWEEP_MAX_PAUSE_MS
 };
 
 typedef void
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index d4ceb1159f98..74b98273153d 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -2959,11 +2959,6 @@ AccumulateTelemetryCallback(int id, uint32_t sample)
       case JS_TELEMETRY_GC_SCC_SWEEP_MAX_PAUSE_MS:
         Telemetry::Accumulate(Telemetry::GC_SCC_SWEEP_MAX_PAUSE_MS, sample);
         break;
-      case JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT:
-        Telemetry::Accumulate(Telemetry::JS_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT, sample);
-        break;
-      default:
-        MOZ_ASSERT_UNREACHABLE("Unexpected JS_TELEMETRY id");
     }
 }
 
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 07cc030cd58c..4bcdae7db7ac 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -334,12 +334,6 @@
     "kind": "flag",
     "description": "Has seen location error"
   },
-  "JS_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT": {
-    "expires_in_version": "never",
-    "kind": "enumerated",
-    "n_values": 10,
-    "description": "Use of SpiderMonkey's deprecated language extensions in web content"
-  },
   "TELEMETRY_PING": {
     "expires_in_version": "never",
     "kind": "exponential",