Merge pull request #381 from Ascrod/master

Remove the Social API

3 files changed, 0 insertions, 40 deletions

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index ade308cfa..69a9ae44d 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -6677,11 +6677,6 @@
     "kind": "boolean",
     "description": "If we are on Windows and neither the Windows countryCode nor the geoip countryCode indicates we are in the US, set to false if they both agree on the value or true otherwise"
   },
-  "SOCIAL_ENABLED_ON_SESSION": {
-    "expires_in_version": "never",
-    "kind": "flag",
-    "description": "Social has been enabled at least once on the current session"
-  },
   "ENABLE_PRIVILEGE_EVER_CALLED": {
     "expires_in_version": "never",
     "kind": "flag",
@@ -8968,30 +8963,6 @@
     "description": "Scaling percentage for the display where the first window is opened (Linux only)",
     "cpp_guard": "XP_LINUX"
   },
-  "SOCIAL_SIDEBAR_STATE": {
-    "expires_in_version": "never",
-    "kind": "boolean",
-    "description": "Social Sidebar state 0: closed, 1: opened.  Toggling between providers will result in a higher opened rate."
-  },
-  "SOCIAL_TOOLBAR_BUTTONS": {
-    "expires_in_version": "never",
-    "kind": "enumerated",
-    "n_values": 3,
-    "description": "Social toolbar button has been used (0:share, 1:status, 2:bookmark)"
-  },
-  "SOCIAL_PANEL_CLICKS": {
-    "expires_in_version": "never",
-    "kind": "enumerated",
-    "n_values": 4,
-    "description": "Social content has been interacted with (0:share, 1:status, 2:bookmark, 3: sidebar)"
-  },
-  "SOCIAL_SIDEBAR_OPEN_DURATION": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 10000000,
-    "n_buckets": 10,
-    "description": "Sidebar showing: seconds that the sidebar has been opened"
-  },
   "SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION": {
     "expires_in_version": "never",
     "kind": "exponential",
diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json
index 486178199..deb1bd5b3 100644
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -610,11 +610,6 @@
     "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
     "SLOW_ADDON_WARNING_RESPONSE_TIME",
     "SLOW_ADDON_WARNING_STATES",
-    "SOCIAL_ENABLED_ON_SESSION",
-    "SOCIAL_PANEL_CLICKS",
-    "SOCIAL_SIDEBAR_OPEN_DURATION",
-    "SOCIAL_SIDEBAR_STATE",
-    "SOCIAL_TOOLBAR_BUTTONS",
     "SPDY_CHUNK_RECVD",
     "SPDY_GOAWAY_LOCAL",
     "SPDY_GOAWAY_PEER",
@@ -1501,11 +1496,6 @@
     "SLOW_ADDON_WARNING_RESPONSE_TIME",
     "SLOW_ADDON_WARNING_STATES",
     "SLOW_SCRIPT_NOTICE_COUNT",
-    "SOCIAL_ENABLED_ON_SESSION",
-    "SOCIAL_PANEL_CLICKS",
-    "SOCIAL_SIDEBAR_OPEN_DURATION",
-    "SOCIAL_SIDEBAR_STATE",
-    "SOCIAL_TOOLBAR_BUTTONS",
     "SPDY_CHUNK_RECVD",
     "SPDY_GOAWAY_LOCAL",
     "SPDY_GOAWAY_PEER",
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index e11d47774..42f3fb809 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -83,7 +83,6 @@ const PREFS_WHITELIST = [
   "services.sync.lastSync",
   "services.sync.numClients",
   "services.sync.engine.",
-  "social.enabled",
   "storage.vacuum.last.",
   "svg.",
   "toolkit.startup.recent_crashes",