Backed out changeset 09e3f293166a (bug 1301289) for xpcshell failures a=backout

services/sync/modules/telemetry.js

@@ -33,7 +33,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
 const log = Log.repository.getLogger("Sync.Telemetry");
 
 const TOPICS = [
-  "profile-before-change",
+  "xpcom-shutdown",
   "weave:service:sync:start",
   "weave:service:sync:finish",
   "weave:service:sync:error",
@@ -361,7 +361,6 @@ class SyncTelemetryImpl {
     // We still call submit() with possibly illegal payloads so that tests can
     // know that the ping was built. We don't end up submitting them, however.
     if (record.syncs.length) {
-      log.trace(`submitting ${record.syncs.length} sync record(s) to telemetry`);
       TelemetryController.submitExternalPing("sync", record);
     }
   }
@@ -406,7 +405,7 @@ class SyncTelemetryImpl {
     log.trace(`observed ${topic} ${data}`);
 
     switch (topic) {
-      case "profile-before-change":
+      case "xpcom-shutdown":
         this.shutdown();
         break;