From 2240562934a59d66a1fef6cabed154d7e7f51010 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Thu, 27 Jul 2017 08:22:15 +0200
Subject: [PATCH] Backed out changeset f65f933ecdce (bug 1359306) for bustage

---
 .../preferences/in-content-new/findInPage.js      | 12 ------------
 toolkit/components/telemetry/Scalars.yaml         | 15 ---------------
 2 files changed, 27 deletions(-)

diff --git a/browser/components/preferences/in-content-new/findInPage.js b/browser/components/preferences/in-content-new/findInPage.js
index b5669336a1db..93ae0de26f66 100644
--- a/browser/components/preferences/in-content-new/findInPage.js
+++ b/browser/components/preferences/in-content-new/findInPage.js
@@ -225,11 +225,6 @@ var gSearchResultsPane = {
     this.removeAllSearchTooltips();
     this.removeAllSearchMenuitemIndicators();
 
-    // Clear telemetry request if user types very frequently.
-    if (this.telemetryTimer) {
-      clearTimeout(this.telemetryTimer);
-    }
-
     let srHeader = document.getElementById("header-searchResults");
 
     if (this.query) {
@@ -279,13 +274,6 @@ var gSearchResultsPane = {
       } else {
         // Creating tooltips for all the instances found
         this.listSearchTooltips.forEach((anchorNode) => this.createSearchTooltip(anchorNode, this.query));
-
-        // Implant search telemetry probe after user stops typing for a while
-        if (this.query.length >= 2) {
-          this.telemetryTimer = setTimeout(() => {
-            Services.telemetry.keyedScalarAdd("preferences.search_query", this.query, 1);
-          }, 1000);
-        }
       }
     } else {
       document.getElementById("sorry-message").textContent = "";
diff --git a/toolkit/components/telemetry/Scalars.yaml b/toolkit/components/telemetry/Scalars.yaml
index 19299cde6c07..7a86cca5243c 100644
--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -398,21 +398,6 @@ preferences:
     release_channel_collection: opt-out
     record_in_processes:
       - main
-  search_query:
-    bug_numbers:
-        - 1359306
-      description: >-
-        Each key is a search query string when user performs a search action within
-        about:preferences, and each value is the number of times that key is recorded.
-        The telemetry data will be recorded if there is a successful search result highlighted.
-      expires: "62"
-      kind: uint
-      keyed: true
-      notification_emails:
-        - chsiang@mozilla.com
-      release_channel_collection: opt-in
-      record_in_processes:
-        - main
 
 # The following section contains WebRTC nICEr scalars
 # For more info on ICE, see https://tools.ietf.org/html/rfc5245