From 1aac4a3f9c52522399f026df9b3dad682da848ff Mon Sep 17 00:00:00 2001
From: Taras Glek <tglek@mozilla.com>
Date: Fri, 1 Jul 2011 14:39:17 -0700
Subject: [PATCH] Bug 668355: s/Timer/AutoTimer/ r=jlebar

---
 dom/base/nsGlobalWindow.cpp              | 2 +-
 dom/plugins/base/nsPluginHost.cpp        | 2 +-
 toolkit/components/telemetry/Telemetry.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 1b4e437caa31..aac0e1747d2c 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -10993,7 +10993,7 @@ nsNavigator::GetBuildID(nsAString& aBuildID)
 NS_IMETHODIMP
 nsNavigator::JavaEnabled(PRBool *aReturn)
 {
-  Telemetry::Timer<Telemetry::CHECK_JAVA_ENABLED> telemetryTimer;
+  Telemetry::AutoTimer<Telemetry::CHECK_JAVA_ENABLED> telemetryTimer;
   // Return true if we have a handler for "application/x-java-vm",
   // otherwise return false.
   *aReturn = PR_FALSE;
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
index f439c53e6e58..2c2ad7d6e9a0 100644
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -2338,7 +2338,7 @@ nsresult nsPluginHost::LoadPlugins()
 // This is needed in ReloadPlugins to prevent possible recursive reloads
 nsresult nsPluginHost::FindPlugins(PRBool aCreatePluginList, PRBool * aPluginsChanged)
 {
-  Telemetry::Timer<Telemetry::FIND_PLUGINS> telemetry;
+  Telemetry::AutoTimer<Telemetry::FIND_PLUGINS> telemetry;
   // let's start timing if we are only really creating the plugin list
   if (aCreatePluginList) {
     NS_TIMELINE_START_TIMER("LoadPlugins");
diff --git a/toolkit/components/telemetry/Telemetry.h b/toolkit/components/telemetry/Telemetry.h
index 1ecb168c0855..56766265b0c4 100644
--- a/toolkit/components/telemetry/Telemetry.h
+++ b/toolkit/components/telemetry/Telemetry.h
@@ -62,14 +62,14 @@ HistogramCount
 void Accumulate(ID id, PRUint32 sample);
 
 template<ID id>
-class Timer {
+class AutoTimer {
 public:
-  Timer():
+  AutoTimer():
     start(TimeStamp::Now())
   {
   }
 
-  ~Timer() {
+  ~AutoTimer() {
     Accumulate(id, (TimeStamp::Now() - start).ToMilliseconds());
   }