Revert of Enabled gpu_times metrics.

tools/telemetry/telemetry/web_perf/metrics/gpu_timeline.py

Index: tools/telemetry/telemetry/web_perf/metrics/gpu_timeline.py
diff --git a/tools/telemetry/telemetry/web_perf/metrics/gpu_timeline.py b/tools/telemetry/telemetry/web_perf/metrics/gpu_timeline.py
index acc4b8d4f657dbad07ba1066b2254e69b38312da..3b01110298fd8dc998fd92db4efdd733374a1353 100644
--- a/tools/telemetry/telemetry/web_perf/metrics/gpu_timeline.py
+++ b/tools/telemetry/telemetry/web_perf/metrics/gpu_timeline.py
@@ -20,16 +20,6 @@
 TRACKED_GL_CONTEXT_NAME = { 'RenderCompositor': 'render_compositor',
                             'BrowserCompositor': 'browser_compositor',
                             'Compositor': 'browser_compositor' }
-
-
-class GPUTimelineListOfValues(list_of_scalar_values.ListOfScalarValues):
-  def __init__(self, page, name, values):
-    super(GPUTimelineListOfValues, self).__init__(page, name, 'ms', values)
-
-
-class GPUTimelineValue(scalar.ScalarValue):
-  def __init__(self, page, name, value):
-    super(GPUTimelineValue, self).__init__(page, name, 'ms', value)
 
 
 def _CalculateFrameTimes(events_per_frame, event_data_func):
@@ -98,19 +88,18 @@
         frame_times_name = '%s_frame_times' % (name)
 
       if durations:
-        results.AddValue(GPUTimelineListOfValues(results.current_page,
-                                                 frame_times_name,
-                                                 durations))
-
-      results.AddValue(GPUTimelineValue(results.current_page,
-                                        TimelineName(name, src, 'max'),
-                                        maximum))
-      results.AddValue(GPUTimelineValue(results.current_page,
-                                        TimelineName(name, src, 'mean'),
-                                        avg))
-      results.AddValue(GPUTimelineValue(results.current_page,
-                                        TimelineName(name, src, 'stddev'),
-                                        stddev))
+        results.AddValue(list_of_scalar_values.ListOfScalarValues(
+            results.current_page, frame_times_name, 'ms', durations))
+
+      results.AddValue(scalar.ScalarValue(results.current_page,
+                                          TimelineName(name, src, 'max'),
+                                          'ms', maximum))
+      results.AddValue(scalar.ScalarValue(results.current_page,
+                                          TimelineName(name, src, 'mean'),
+                                          'ms', avg))
+      results.AddValue(scalar.ScalarValue(results.current_page,
+                                          TimelineName(name, src, 'stddev'),
+                                          'ms', stddev))
 
   def _CalculateGPUTimelineData(self, model):
     """Uses the model and calculates the times for various values for each