Backed out changeset 49b1465d3e5e (bug 1044020) for compilation failures

iaxat · Sep 29, 2014 · 65343c5 · 65343c5
1 parent 5e019af
commit 65343c5
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 717 deletions.
diff --git a/PHONY b/PHONY
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
@@ -873,9 +873,6 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/components/DataStoreImpl.js
 @BINPATH@/components/dom_datastore.xpt
 
-; Shutdown Terminator
-@BINPATH@/components/nsTerminatorTelemetry.js
-@BINPATH@/components/terminator.manifest
 
 #ifdef MOZ_ASAN
 #ifdef CLANG_CXX

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
@@ -6673,27 +6673,6 @@
     "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",
-    "high": 65,
-    "n_buckets": 10,
-    "description": "Duration of shutdown phase quit-application, as measured by the shutdown terminator, in seconds of activity"
-  },
-  "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 65,
-    "n_buckets": 10,
-    "description": "Duration of shutdown phase profile-change-teardown, as measured by the shutdown terminator, in seconds of activity"
-  },
-  "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 65,
-    "n_buckets": 10,
-    "description": "Duration of shutdown phase xpcom-will-shutdown, as measured by the shutdown terminator, in seconds of activity"
-  },
   "BR_9_2_1_SUBJECT_ALT_NAMES": {
     "expires_in_version": "never",
     "kind": "enumerated",

diff --git a/toolkit/components/terminator/moz.build b/toolkit/components/terminator/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
-
 SOURCES += [
     'nsTerminator.cpp',
 ]
@@ -15,7 +13,6 @@ EXPORTS += [
 ]
 
 EXTRA_COMPONENTS += [
-    'nsTerminatorTelemetry.js',
     'terminator.manifest',
 ]