Update files in telemetry/page/ to use results.AddValue()

TBR=nduca@chromium.org
BUG=346958

Review URL: https://codereview.chromium.org/385253002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282725 0039d316-1c4b-4281-b951-d872f2087c98

tools/telemetry/telemetry/page/page_measurement.py

@@ -20,7 +20,8 @@ class PageMeasurement(page_test.PageTest):
         def MeasurePage(self, page, tab, results):
            body_child_count = tab.EvaluateJavaScript(
                'document.body.children.length')
-           results.Add('body_children', 'count', body_child_count)
+           results.AddValue(scalar.ScalarValue(
+               page, 'body_children', 'count', body_child_count))
 
      if __name__ == '__main__':
          page_measurement.Main(BodyChildElementMeasurement())
@@ -34,7 +35,8 @@ class PageMeasurement(page_test.PageTest):
         def MeasurePage(self, page, tab, results):
            body_child_count = tab.EvaluateJavaScript(
               'document.querySelector('%s').children.length')
-           results.Add('children', 'count', child_count)
+           results.AddValue(scalar.ScalarValue(
+               page, 'children', 'count', child_count))
 
   is_action_name_to_run_optional determines what to do if action_name_to_run is
   not empty but the page doesn't have that action. The page will run (without
@@ -77,7 +79,7 @@ class PageMeasurement(page_test.PageTest):
     page is a page_set.Page
     tab is an instance of telemetry.core.Tab
 
-    Should call results.Add(name, units, value) for each result, or raise an
+    Should call results.AddValue(...) for each result, or raise an
     exception on failure. The name and units of each Add() call must be
     the same across all iterations. The name 'url' must not be used.
 
@@ -90,6 +92,7 @@ class PageMeasurement(page_test.PageTest):
          res = tab.EvaluateJavaScript('2+2')
          if res != 4:
            raise Exception('Oh, wow.')
-         results.Add('two_plus_two', 'count', res)
+         results.AddValue(scalar.ScalarValue(
+             page, 'two_plus_two', 'count', res))
     """
     raise NotImplementedError()

tools/telemetry/telemetry/page/page_measurement_unittest.py

@@ -14,6 +14,7 @@ from telemetry.page import page_measurement_unittest_base
 from telemetry.page import page_set
 from telemetry.page import page_set_archive_info
 from telemetry.unittest import options_for_unittests
+from telemetry.value import scalar
 
 
 class MeasurementThatFails(page_measurement.PageMeasurement):
@@ -30,7 +31,7 @@ class MeasurementThatHasDefaults(page_measurement.PageMeasurement):
     if self.options.x != 3:
       raise page_measurement.MeasurementFailure(
           'Expected x == 3, got x == ' + self.options.x)
-    results.Add('x', 'ms', 7)
+    results.AddValue(scalar.ScalarValue(page, 'x', 'ms', 7))
 
 class MeasurementForBlank(page_measurement.PageMeasurement):
   def MeasurePage(self, page, tab, results):

tools/telemetry/telemetry/page/page_runner_unittest.py

@@ -19,6 +19,7 @@ from telemetry.page import page_test
 from telemetry.page import page_runner
 from telemetry.page import test_expectations
 from telemetry.unittest import options_for_unittests
+from telemetry.value import scalar
 
 
 SIMPLE_CREDENTIALS_STRING = """
@@ -213,9 +214,10 @@ class PageRunnerTests(unittest.TestCase):
 
     class Measurement(page_measurement.PageMeasurement):
       i = 0
-      def MeasurePage(self, _1, _2, results):
+      def MeasurePage(self, page, _, results):
         self.i += 1
-        results.Add('metric', 'unit', self.i)
+        results.AddValue(scalar.ScalarValue(
+            page, 'metric', 'unit', self.i))
 
     output_file = tempfile.NamedTemporaryFile(delete=False).name
     try: