merge backout

toolkit/components/telemetry/Telemetry.h

@@ -104,34 +104,6 @@ private:
   MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
-template<ID id>
-class AutoCounter {
-public:
-  AutoCounter(PRUint32 counterStart = 0 MOZILLA_GUARD_OBJECT_NOTIFIER_PARAM)
-    : counter(counterStart)
-  {
-    MOZILLA_GUARD_OBJECT_NOTIFIER_INIT;
-  }
-
-  ~AutoCounter() {
-    Accumulate(id, counter);
-  }
-
-  // Prefix increment only, to encourage good habits.
-  void operator++() {
-    ++counter;
-  }
-
-  // Chaining doesn't make any sense, don't return anything.
-  void operator+=(int increment) {
-    counter += increment;
-  }
-
-private:
-  PRUint32 counter;
-  MOZILLA_DECL_USE_GUARD_OBJECT_NOTIFIER
-};
-
 /**
  * Records slow SQL statements for Telemetry reporting.
  * For privacy reasons, only prepared statements are reported.