More polish in prep for CrOS support

tools/gpu/gpu_tools/scrolling_benchmark_unittest.py

Index: tools/gpu/gpu_tools/scrolling_benchmark_unittest.py
diff --git a/tools/gpu/gpu_tools/scrolling_benchmark_unittest.py b/tools/gpu/gpu_tools/scrolling_benchmark_unittest.py
index 33377c4c62db28bf688a0cd46c05fa5a8dcab820..45a388bd1ccd7e8f3906214a5e0eae7e7deed37f 100644
--- a/tools/gpu/gpu_tools/scrolling_benchmark_unittest.py
+++ b/tools/gpu/gpu_tools/scrolling_benchmark_unittest.py
@@ -7,7 +7,7 @@ import multi_page_benchmark
 class ScrollingBenchmarkUnitTest(
   multi_page_benchmark.MultiPageBenchmarkUnitTest):
 
-  def testBasicFunctionality(self):
+  def testScrollingWithGpuBenchmarkingExtension(self):
     ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html')
 
     benchmark = scrolling_benchmark.ScrollingBenchmark()
@@ -22,6 +22,23 @@ class ScrollingBenchmarkUnitTest(
     self.assertEqual(1, len(results))
     self.assertTrue('scrollable_page.html' in results[0][0])
 
+  def testScrollingWithoutGpuBenchmarkingExtension(self):
+    ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html')
+
+    benchmark = scrolling_benchmark.ScrollingBenchmark()
+    benchmark.use_gpu_bencharking_extension = False
+
+    rows = self.RunBenchmark(benchmark, ps)
+
+    self.assertEqual(0, len(benchmark.page_failures))
+
+    header = rows[0]
+    results = rows[1:]
+    self.assertEqual(['url', 'dropped_percent', 'mean_frame_time_ms'],
+                     header)
+    self.assertEqual(1, len(results))
+    self.assertTrue('scrollable_page.html' in results[0][0])
+
   def testCalcResultsFromRAFRenderStats(self):
     rendering_stats = {'droppedFrameCount': 5,
                'totalTimeInSeconds': 1,