Change the naming convention of compound_action to RunCompoundAction. This unifies

the naming convention of json pageset with python pageset.


BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=257913

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

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

12 files changed, 12 insertions, 12 deletions

diff --git a/tools/perf/measurements/endure.py b/tools/perf/measurements/endure.py
index 6dbeb0d..c8408a3 100644
--- a/tools/perf/measurements/endure.py
+++ b/tools/perf/measurements/endure.py
@@ -38,7 +38,7 @@ _V8_MEMORY_ALLOCATED = [
 
 class Endure(page_measurement.PageMeasurement):
   def __init__(self):
-    super(Endure, self).__init__('endure')
+    super(Endure, self).__init__('RunEndure')
     # Browser object, saved so that browser.memory_stats can be accessed.
     self._browser = None
 
diff --git a/tools/perf/measurements/media.py b/tools/perf/measurements/media.py
index 11e6320..7936dae 100644
--- a/tools/perf/measurements/media.py
+++ b/tools/perf/measurements/media.py
@@ -16,7 +16,7 @@ class Media(page_measurement.PageMeasurement):
   """
 
   def __init__(self):
-    super(Media, self).__init__('media_metrics')
+    super(Media, self).__init__('RunMediaMetrics')
     self._media_metric = None
     # Used to add browser power and CPU metrics to results per test.
     self._add_browser_metrics = False
diff --git a/tools/perf/measurements/memory.py b/tools/perf/measurements/memory.py
index d9cbe94..0ce01f0 100644
--- a/tools/perf/measurements/memory.py
+++ b/tools/perf/measurements/memory.py
@@ -8,7 +8,7 @@ from telemetry.page import page_measurement
 
 class Memory(page_measurement.PageMeasurement):
   def __init__(self):
-    super(Memory, self).__init__('stress_memory')
+    super(Memory, self).__init__('RunStressMemory')
     self._memory_metric = None
     self._power_metric = power.PowerMetric()
 
diff --git a/tools/perf/measurements/no_op.py b/tools/perf/measurements/no_op.py
index 5f96812..fa8d23d 100644
--- a/tools/perf/measurements/no_op.py
+++ b/tools/perf/measurements/no_op.py
@@ -6,7 +6,7 @@ from telemetry.page import page_measurement
 
 class NoOp(page_measurement.PageMeasurement):
   def __init__(self):
-    super(NoOp, self).__init__('no_op')
+    super(NoOp, self).__init__('RunNoOp')
 
   def WillRunAction(self, page, tab, action):
     pass
diff --git a/tools/perf/measurements/repaint.py b/tools/perf/measurements/repaint.py
index 57c5a13..d1cfa19 100644
--- a/tools/perf/measurements/repaint.py
+++ b/tools/perf/measurements/repaint.py
@@ -8,7 +8,7 @@ from telemetry.page import page_measurement
 
 class Repaint(page_measurement.PageMeasurement):
   def __init__(self):
-    super(Repaint, self).__init__('repaint', False)
+    super(Repaint, self).__init__('RunRepaint', False)
     self._smoothness_controller = None
 
   def WillRunActions(self, page, tab):
diff --git a/tools/perf/measurements/session_restore_with_url.py b/tools/perf/measurements/session_restore_with_url.py
index 0178de6..40f5ce2 100644
--- a/tools/perf/measurements/session_restore_with_url.py
+++ b/tools/perf/measurements/session_restore_with_url.py
@@ -9,7 +9,7 @@ class SessionRestoreWithUrl(session_restore.SessionRestore):
 
   def __init__(self):
     super(SessionRestoreWithUrl, self).__init__(
-        action_name_to_run='navigate_steps')
+        action_name_to_run='RunNavigateSteps')
 
   def CanRunForPage(self, page):
     # Run for every page in the page set that has a startup url.
diff --git a/tools/perf/measurements/smoothness.py b/tools/perf/measurements/smoothness.py
index 239b622..fd609ec7 100644
--- a/tools/perf/measurements/smoothness.py
+++ b/tools/perf/measurements/smoothness.py
@@ -9,7 +9,7 @@ from telemetry.page import page_measurement
 
 class Smoothness(page_measurement.PageMeasurement):
   def __init__(self):
-    super(Smoothness, self).__init__('smoothness')
+    super(Smoothness, self).__init__('RunSmoothness')
     self._power_metric = None
     self._smoothness_controller = None
 
diff --git a/tools/perf/measurements/startup.py b/tools/perf/measurements/startup.py
index 6f15b20..5c74af7 100644
--- a/tools/perf/measurements/startup.py
+++ b/tools/perf/measurements/startup.py
@@ -66,4 +66,4 @@ class StartWithUrl(Startup):
   """
 
   def __init__(self):
-    super(StartWithUrl, self).__init__(action_name_to_run='navigate_steps')
+    super(StartWithUrl, self).__init__(action_name_to_run='RunNavigateSteps')
diff --git a/tools/perf/measurements/thread_times.py b/tools/perf/measurements/thread_times.py
index d5b9a51..13a9075 100644
--- a/tools/perf/measurements/thread_times.py
+++ b/tools/perf/measurements/thread_times.py
@@ -7,7 +7,7 @@ from telemetry.page import page_measurement
 
 class ThreadTimes(page_measurement.PageMeasurement):
   def __init__(self):
-    super(ThreadTimes, self).__init__('smoothness')
+    super(ThreadTimes, self).__init__('RunSmoothness')
     self._metric = None
 
   @classmethod
diff --git a/tools/perf/measurements/timeline_based_measurement.py b/tools/perf/measurements/timeline_based_measurement.py
index b06fa85..4c4f67f 100644
--- a/tools/perf/measurements/timeline_based_measurement.py
+++ b/tools/perf/measurements/timeline_based_measurement.py
@@ -92,7 +92,7 @@ class TimelineBasedMeasurement(page_measurement.PageMeasurement):
 
   """
   def __init__(self):
-    super(TimelineBasedMeasurement, self).__init__('smoothness')
+    super(TimelineBasedMeasurement, self).__init__('RunSmoothness')
 
   @classmethod
   def AddCommandLineArgs(cls, parser):
diff --git a/tools/perf/measurements/timeline_based_measurement_unittest.py b/tools/perf/measurements/timeline_based_measurement_unittest.py
index df1304c..24abf1b 100644
--- a/tools/perf/measurements/timeline_based_measurement_unittest.py
+++ b/tools/perf/measurements/timeline_based_measurement_unittest.py
@@ -103,7 +103,7 @@ class TimelineBasedMeasurementTest(
   def testTimelineBasedForSmoke(self):
     ps = self.CreatePageSetFromFileInUnittestDataDir(
         'interaction_enabled_page.html')
-    setattr(ps.pages[0], 'smoothness', {'action': 'wait',
+    setattr(ps.pages[0], 'RunSmoothness', {'action': 'wait',
                                         'javascript': 'window.animationDone'})
     measurement = tbm_module.TimelineBasedMeasurement()
     results = self.RunMeasurement(measurement, ps,
diff --git a/tools/perf/measurements/webrtc.py b/tools/perf/measurements/webrtc.py
index 23eabbe..87dc61e 100644
--- a/tools/perf/measurements/webrtc.py
+++ b/tools/perf/measurements/webrtc.py
@@ -11,7 +11,7 @@ class WebRTC(page_measurement.PageMeasurement):
   """Gathers WebRTC-related metrics on a page set."""
 
   def __init__(self):
-    super(WebRTC, self).__init__('webrtc')
+    super(WebRTC, self).__init__('RunWebrtc')
     self._cpu_metric = None
     self._memory_metric = None