Revert of Support tracing metrics for measureTime & measureFrameTime method in blink_perf

third_party/WebKit/PerformanceTests/resources/runner.js

Index: third_party/WebKit/PerformanceTests/resources/runner.js
diff --git a/third_party/WebKit/PerformanceTests/resources/runner.js b/third_party/WebKit/PerformanceTests/resources/runner.js
index 7ce98b7a6e066a234b59009ba97269ae7de1c4cf..22a5e8eadcce6f54b3ce7bc6bde46b2d979af781 100644
--- a/third_party/WebKit/PerformanceTests/resources/runner.js
+++ b/third_party/WebKit/PerformanceTests/resources/runner.js
@@ -157,16 +157,8 @@
         PerfTestRunner.log("Running " + iterationCount + " times");
         if (test.doNotIgnoreInitialRun)
             completedIterations++;
-
-        if (runner && test.tracingCategories && window.testRunner &&
-            window.testRunner.supportTracing) {
-            window.testRunner.traceEventsToMeasure = test.traceEventsToMeasure;
-            window.testRunner.startTracing(test.tracingCategories, function() {
-                scheduleNextRun(scheduler, runner);
-            });
-        } else if (runner) {
+        if (runner)
             scheduleNextRun(scheduler, runner);
-        }
     }
 
     function scheduleNextRun(scheduler, runner) {
@@ -233,17 +225,8 @@
             logInDocument("Got an exception while finalizing the test with name=" + exception.name + ", message=" + exception.message);
         }
 
-        if (window.testRunner) {
-            if (currentTest.traceEventsToMeasure &&
-                testRunner.supportTracing) {
-                testRunner.stopTracingAndMeasure(
-                    currentTest.traceEventsToMeasure, function() {
-                        testRunner.notifyDone();
-                    });
-            } else {
-                testRunner.notifyDone();
-            }
-        }
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 
     PerfTestRunner.prepareToMeasureValuesAsync = function (test) {
@@ -264,25 +247,6 @@
         if (completedIterations >= iterationCount)
             finish();
     }
-
-    function addRunTestStartMarker() {
-      if (!window.testRunner || !window.testRunner.supportTracing)
-          return;
-      if (completedIterations < 0)
-          console.time('blink_perf.runTest.warmup');
-      else
-          console.time('blink_perf.runTest');
-    }
-
-    function addRunTestEndMarker() {
-      if (!window.testRunner || !window.testRunner.supportTracing)
-          return;
-      if (completedIterations < 0)
-          console.timeEnd('blink_perf.runTest.warmup');
-      else
-          console.timeEnd('blink_perf.runTest');
-    }
-
 
     PerfTestRunner.measureFrameTime = function (test) {
         PerfTestRunner.unit = "ms";
@@ -297,12 +261,9 @@
 
     var lastFrameTime = -1;
     function measureFrameTimeOnce() {
-        if (lastFrameTime != -1)
-          addRunTestEndMarker();
         var now = PerfTestRunner.now();
         var result = lastFrameTime == -1 ? -1 : now - lastFrameTime;
         lastFrameTime = now;
-        addRunTestStartMarker();
 
         var returnValue = currentTest.run();
         if (returnValue - 0 === returnValue) {
@@ -329,9 +290,7 @@
         PerfTestRunner.gc();
 
         var start = PerfTestRunner.now();
-        addRunTestStartMarker();
         var returnValue = currentTest.run();
-        addRunTestEndMarker();
         var end = PerfTestRunner.now();
 
         if (returnValue - 0 === returnValue) {