Merge Repaint with Smoothness measurement since it control code is

almost the same to smoothness, except for customized browser option.
Remove smoothness_controller since it's no longer used.

BUG=444703

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

Cr-Commit-Position: refs/heads/master@{#329018}

4 files changed, 13 insertions, 38 deletions

diff --git a/tools/perf/benchmarks/repaint.py b/tools/perf/benchmarks/repaint.py
index 7cebc5d..e2cc95e 100644
--- a/tools/perf/benchmarks/repaint.py
+++ b/tools/perf/benchmarks/repaint.py
@@ -5,7 +5,7 @@
 from telemetry import benchmark
 
 from benchmarks import silk_flags
-from measurements import repaint as repaint_measurement
+from measurements import smoothness
 import page_sets
 
 
@@ -32,7 +32,7 @@ class _Repaint(benchmark.Benchmark):
         options.mode, options.width, options.height)
 
   def CreatePageTest(self, options):
-    return repaint_measurement.Repaint()
+    return smoothness.Repaint()
 
 @benchmark.Enabled('android')
 class RepaintKeyMobileSites(_Repaint):
diff --git a/tools/perf/measurements/repaint.py b/tools/perf/measurements/repaint.py
deleted file mode 100644
index 3225238..0000000
--- a/tools/perf/measurements/repaint.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2014 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.page import page_test
-
-from measurements import smoothness_controller
-
-
-class Repaint(page_test.PageTest):
-  def __init__(self):
-    super(Repaint, self).__init__()
-    self._smoothness_controller = None
-
-  def CustomizeBrowserOptions(self, options):
-    options.AppendExtraBrowserArgs([
-        '--enable-impl-side-painting',
-        '--enable-threaded-compositing',
-        '--enable-gpu-benchmarking'
-    ])
-
-  def WillNavigateToPage(self, page, tab):
-    self._smoothness_controller = smoothness_controller.SmoothnessController()
-    self._smoothness_controller.Start(page, tab)
-
-  def DidRunActions(self, page, tab):
-    self._smoothness_controller.Stop(tab)
-
-  def ValidateAndMeasurePage(self, page, tab, results):
-    self._smoothness_controller.AddResults(tab, results)
-
-  def CleanUpAfterPage(self, _, tab):
-    self._smoothness_controller.CleanUp(tab)
diff --git a/tools/perf/measurements/repaint_unittest.py b/tools/perf/measurements/repaint_unittest.py
index 4761636..d7db42fe 100644
--- a/tools/perf/measurements/repaint_unittest.py
+++ b/tools/perf/measurements/repaint_unittest.py
@@ -8,7 +8,7 @@ from telemetry.page import page as page_module
 from telemetry.unittest_util import options_for_unittests
 from telemetry.unittest_util import page_test_test_case
 
-from measurements import repaint
+from measurements import smoothness
 from page_sets import repaint_helpers
 
 
@@ -37,7 +37,7 @@ class RepaintUnitTest(page_test_test_case.PageTestTestCase):
   def testRepaint(self):
     ps = self.CreateEmptyPageSet()
     ps.AddUserStory(TestRepaintPage(ps, ps.base_dir))
-    measurement = repaint.Repaint()
+    measurement = smoothness.Repaint()
     results = self.RunMeasurement(measurement, ps, options=self._options)
     self.assertEquals(0, len(results.failures))
 
@@ -61,4 +61,4 @@ class RepaintUnitTest(page_test_test_case.PageTestTestCase):
 
   @decorators.Disabled('android')
   def testCleanUpTrace(self):
-    self.TestTracingCleanedUp(repaint.Repaint, self._options)
+    self.TestTracingCleanedUp(smoothness.Repaint, self._options)
diff --git a/tools/perf/measurements/smoothness.py b/tools/perf/measurements/smoothness.py
index 74cf673..b2c7fe8 100644
--- a/tools/perf/measurements/smoothness.py
+++ b/tools/perf/measurements/smoothness.py
@@ -56,6 +56,14 @@ class Smoothness(page_test.PageTest):
     self._tbm.DidRunUserStory(tracing_controller)
 
 
+class Repaint(Smoothness):
+  def CustomizeBrowserOptions(self, options):
+    options.AppendExtraBrowserArgs([
+        '--enable-impl-side-painting',
+        '--enable-threaded-compositing',
+        '--enable-gpu-benchmarking'
+    ])
+
 class SmoothnessWithRestart(Smoothness):
   def __init__(self):
     super(SmoothnessWithRestart, self).__init__(