[telemetry] More fixes for my page_test_result rewrite

tools/perf/perf_tools/smoothness_benchmark_unittest.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from telemetry import multi_page_benchmark
 from telemetry import multi_page_benchmark_unittest_base
 from telemetry import page
 from perf_tools import smoothness_benchmark
 
 from telemetry import browser_finder
 from telemetry import options_for_unittests
+from telemetry.page_benchmark_results import PageBenchmarkResults
 
 import os
 import urlparse
 
 class SmoothnessBenchmarkUnitTest(
   multi_page_benchmark_unittest_base.MultiPageBenchmarkUnitTestBase):
 
   def testFirstPaintTimeMeasurement(self):
     ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html')
 
@@ skipping 20 matching lines @@
     results0 = all_results.page_results[0]
 
     self.assertTrue('dropped_percent' in results0)
     self.assertTrue('mean_frame_time' in results0)
 
   def testCalcResultsFromRAFRenderStats(self):
     rendering_stats = {'droppedFrameCount': 5,
                        'totalTimeInSeconds': 1,
                        'numAnimationFrames': 10,
                        'numFramesSentToScreen': 10}
-    res = multi_page_benchmark.BenchmarkResults()
+    res = PageBenchmarkResults()
     res.WillMeasurePage(page.Page('http://foo.com/'))
     smoothness_benchmark.CalcScrollResults(rendering_stats, res)
     res.DidMeasurePage()
-    self.assertEquals(50, res.page_results[0]['dropped_percent'])
-    self.assertAlmostEquals(100, res.page_results[0]['mean_frame_time'], 2)
+    self.assertEquals(50, res.page_results[0]['dropped_percent'].value)
+    self.assertAlmostEquals(
+      100,
+      res.page_results[0]['mean_frame_time'].value, 2)
 
   def testCalcResultsRealRenderStats(self):
     rendering_stats = {'numFramesSentToScreen': 60,
                        'globalTotalTextureUploadTimeInSeconds': 0,
                        'totalProcessingCommandsTimeInSeconds': 0,
                        'globalTextureUploadCount': 0,
                        'droppedFrameCount': 0,
                        'textureUploadCount': 0,
                        'numAnimationFrames': 10,
                        'totalPaintTimeInSeconds': 0.35374299999999986,
                        'globalTotalProcessingCommandsTimeInSeconds': 0,
                        'totalTextureUploadTimeInSeconds': 0,
                        'totalRasterizeTimeInSeconds': 0,
                        'totalTimeInSeconds': 1.0}
-    res = multi_page_benchmark.BenchmarkResults()
+    res = PageBenchmarkResults()
     res.WillMeasurePage(page.Page('http://foo.com/'))
     smoothness_benchmark.CalcScrollResults(rendering_stats, res)
     res.DidMeasurePage()
-    self.assertEquals(0, res.page_results[0]['dropped_percent'])
-    self.assertAlmostEquals(1000/60., res.page_results[0]['mean_frame_time'], 2)
+    self.assertEquals(0, res.page_results[0]['dropped_percent'].value)
+    self.assertAlmostEquals(
+      1000/60.,
+      res.page_results[0]['mean_frame_time'].value, 2)
 
   def testBoundingClientRect(self):
     options = options_for_unittests.GetCopy()
     browser_to_create = browser_finder.FindBrowser(options)
     if not browser_to_create:
       raise Exception('No browser found, cannot continue test.')
 
     with browser_to_create.Create() as browser:
       tab = browser.tabs[0]
       ps = self.CreatePageSetFromFileInUnittestDataDir('blank.html')
@@ skipping 34 matching lines @@
       self.assertTrue(rect_right <= viewport_width)
 
   def testDoesImplThreadScroll(self):
     ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html')
 
     benchmark = smoothness_benchmark.SmoothnessBenchmark()
     benchmark.force_enable_threaded_compositing = True
     all_results = self.RunBenchmark(benchmark, ps)
 
     results0 = all_results.page_results[0]
-    self.assertTrue(results0['percent_impl_scrolled'] > 0)
+    self.assertTrue(results0['percent_impl_scrolled'].value > 0)
 
   def testScrollingWithoutGpuBenchmarkingExtension(self):
     ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html')
 
     benchmark = smoothness_benchmark.SmoothnessBenchmark()
     benchmark.use_gpu_benchmarking_extension = False
     all_results = self.RunBenchmark(benchmark, ps)
 
     self.assertEqual(0, len(all_results.page_failures))
     self.assertEqual(1, len(all_results.page_results))
     results0 = all_results.page_results[0]
 
     self.assertTrue('dropped_percent' in results0)
     self.assertTrue('mean_frame_time' in results0)