Fix format produced by chart data recorder.

mojo/devtools/common/devtoolslib/perf_dashboard_unittest.py

Index: mojo/devtools/common/devtoolslib/perf_dashboard_unittest.py
diff --git a/mojo/devtools/common/devtoolslib/perf_dashboard_unittest.py b/mojo/devtools/common/devtoolslib/perf_dashboard_unittest.py
index b9c3b17e909b635cc8c0f908f2dd0bc30bbb8619..98714c96fdf630d57e4c3af328c928435e825b1f 100644
--- a/mojo/devtools/common/devtoolslib/perf_dashboard_unittest.py
+++ b/mojo/devtools/common/devtoolslib/perf_dashboard_unittest.py
@@ -5,7 +5,6 @@
 """Tests for the Chromium Performance Dashboard data format implementation."""
 
 import imp
-import json
 import os.path
 import sys
 import unittest
@@ -24,7 +23,7 @@ class ChartDataRecorderTest(unittest.TestCase):
   def test_empty(self):
     """Tests chart data with no charts."""
     recorder = ChartDataRecorder('benchmark')
-    result = json.loads(recorder.get_json())
+    result = recorder.get_chart_data()
     self.assertEquals({
         'format_version': '1.0',
         'benchmark_name': 'benchmark',
@@ -36,7 +35,7 @@ class ChartDataRecorderTest(unittest.TestCase):
     recorder.record_scalar('chart', 'val1', 'ms', 1)
     recorder.record_scalar('chart', 'val2', 'ms', 2)
 
-    result = json.loads(recorder.get_json())
+    result = recorder.get_chart_data()
     self.assertEquals('1.0', result['format_version'])
     self.assertEquals('benchmark', result['benchmark_name'])
 
@@ -45,14 +44,12 @@ class ChartDataRecorderTest(unittest.TestCase):
     self.assertEquals(2, len(charts['chart']))
     self.assertEquals({
         'type': 'scalar',
-        'name': 'val1',
         'units': 'ms',
-        'value': 1}, charts['chart'][0])
+        'value': 1}, charts['chart']['val1'])
     self.assertEquals({
         'type': 'scalar',
-        'name': 'val2',
         'units': 'ms',
-        'value': 2}, charts['chart'][1])
+        'value': 2}, charts['chart']['val2'])
 
   def test_two_charts(self):
     """Tests chart data with two samples over two charts."""
@@ -60,7 +57,7 @@ class ChartDataRecorderTest(unittest.TestCase):
     recorder.record_scalar('chart1', 'val1', 'ms', 1)
     recorder.record_scalar('chart2', 'val2', 'ms', 2)
 
-    result = json.loads(recorder.get_json())
+    result = recorder.get_chart_data()
     self.assertEquals('1.0', result['format_version'])
     self.assertEquals('benchmark', result['benchmark_name'])
 
@@ -69,12 +66,10 @@ class ChartDataRecorderTest(unittest.TestCase):
     self.assertEquals(1, len(charts['chart1']))
     self.assertEquals({
         'type': 'scalar',
-        'name': 'val1',
         'units': 'ms',
-        'value': 1}, charts['chart1'][0])
+        'value': 1}, charts['chart1']['val1'])
     self.assertEquals(1, len(charts['chart2']))
     self.assertEquals({
         'type': 'scalar',
-        'name': 'val2',
         'units': 'ms',
-        'value': 2}, charts['chart2'][0])
+        'value': 2}, charts['chart2']['val2'])