From 87225c43b9b500aa513929509bfb37927813f8f0 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Sat, 25 Apr 2015 13:50:27 +0900
Subject: [PATCH] Backed out changeset 5468f1f83ca8 (bug 1145824) for
 mochitest-other failure

---
 tools/profiler/nsIProfiler.idl |  8 +-------
 tools/profiler/nsProfiler.cpp  | 12 ++----------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/tools/profiler/nsIProfiler.idl b/tools/profiler/nsIProfiler.idl
index 0e950ff1d3d4..e4546cefb88c 100644
--- a/tools/profiler/nsIProfiler.idl
+++ b/tools/profiler/nsIProfiler.idl
@@ -12,7 +12,7 @@ class nsCString;
 
 [ref] native StringArrayRef(const nsTArray<nsCString>);
 
-[scriptable, uuid(9c3c0534-ef4b-4a6e-a1a6-4522d4824ac8)]
+[scriptable, uuid(edd65f3f-c2a2-4217-a2e2-40347ba4a2b3)]
 interface nsIProfiler : nsISupports
 {
   void StartProfiler(in uint32_t aEntries, in double aInterval,
@@ -34,12 +34,6 @@ interface nsIProfiler : nsISupports
   void GetBufferInfo(out uint32_t aCurrentPosition, out uint32_t aTotalSize,
                      out uint32_t aGeneration);
 
-  /**
-   * Returns the elapsed time, in milliseconds, since the last StartProfiler call.
-   * Returns 0 if there is no active sampler.
-   */
-  float getElapsedTime();
-
   /**
    * Returns a JSON string of an array of shared library objects.
    * Every object has three properties: start, end, and name.
diff --git a/tools/profiler/nsProfiler.cpp b/tools/profiler/nsProfiler.cpp
index 97e5f25dd80f..9d127b4a9d07 100644
--- a/tools/profiler/nsProfiler.cpp
+++ b/tools/profiler/nsProfiler.cpp
@@ -201,9 +201,8 @@ nsProfiler::DumpProfileToFile(const char* aFilename)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsProfiler::GetProfileData(JSContext* aCx,
-                           JS::MutableHandle<JS::Value> aResult)
+NS_IMETHODIMP nsProfiler::GetProfileData(JSContext* aCx,
+                                         JS::MutableHandle<JS::Value> aResult)
 {
   JS::RootedObject obj(aCx, profiler_get_profile_jsobject(aCx));
   if (!obj) {
@@ -213,13 +212,6 @@ nsProfiler::GetProfileData(JSContext* aCx,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsProfiler::GetElapsedTime(float* aElapsedTime)
-{
-  *aElapsedTime = static_cast<float>(profiler_time());
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsProfiler::IsActive(bool *aIsActive)
 {