Move silk and fast_path benchmarks into their proper places

We are try name benchmarks be named by the measurement name. This changes silk
and fast path to keep that convention. But, in deference to folks knowing the
old names and buildbot pointing at the old names, this patch includes the old
names for backcompat.

R=ernstm
NOTRY=True

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

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

4 files changed, 40 insertions, 29 deletions

diff --git a/tools/perf/benchmarks/fast_path.py b/tools/perf/benchmarks/fast_path.py
deleted file mode 100644
index a3b9544..0000000
--- a/tools/perf/benchmarks/fast_path.py
+++ /dev/null
@@ -1,14 +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 import test
-
-from measurements import thread_times
-
-class FastPathCases(test.Test):
-  """Measures timeline metrics while performing smoothness action on
-  key mobile sites labeled with fast-path tag.
-  http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
-  test = thread_times.ThreadTimes
-  page_set = 'page_sets/key_mobile_sites.json'
-  options = {'page_label_filter' : 'fastpath'}
diff --git a/tools/perf/benchmarks/silk.py b/tools/perf/benchmarks/silk.py
deleted file mode 100644
index 9b11552..0000000
--- a/tools/perf/benchmarks/silk.py
+++ /dev/null
@@ -1,15 +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 import test
-
-from measurements import thread_times
-
-class SilkKeySilkCases(test.Test):
-  """Measures timeline metrics while performing smoothness action on
-  key silk cases.
-
-  http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
-  test = thread_times.ThreadTimes
-  page_set = 'page_sets/key_silk_cases.json'
-  options = {"report_silk_results": True}
diff --git a/tools/perf/benchmarks/smoothness.py b/tools/perf/benchmarks/smoothness.py
index 87e679d..5cbc01f 100644
--- a/tools/perf/benchmarks/smoothness.py
+++ b/tools/perf/benchmarks/smoothness.py
@@ -33,6 +33,13 @@ class SmoothnessToughAnimationCases(test.Test):
   page_set = 'page_sets/tough_animation_cases.json'
 
 
+class SmoothnessKeySilkCases(test.Test):
+  """Measures rendering statistics for the key silk cases without GPU
+  rasterization
+  """
+  test = smoothness.Smoothness
+  page_set = 'page_sets/key_silk_cases.json'
+
 class SmoothnessThreadedRasterizationKeySilkCases(test.Test):
   """Measures rendering statistics for the key silk cases without GPU
   rasterization
diff --git a/tools/perf/benchmarks/thread_times.py b/tools/perf/benchmarks/thread_times.py
new file mode 100644
index 0000000..06764d2
--- /dev/null
+++ b/tools/perf/benchmarks/thread_times.py
@@ -0,0 +1,33 @@
+# 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 import test
+
+from measurements import thread_times
+
+class ThreadTimesKeySilkCases(test.Test):
+  """Measures timeline metrics while performing smoothness action on key silk
+  cases."""
+  test = thread_times.ThreadTimes
+  page_set = 'page_sets/key_silk_cases.json'
+  options = {"report_silk_results": True}
+
+class LegacySilkBenchmark(ThreadTimesKeySilkCases):
+  """Same as thread_times.key_silk_cases but with the old name."""
+  @classmethod
+  def GetName(cls):
+    return "silk.key_silk_cases"
+
+class ThreadTimesFastPathMobileSites(test.Test):
+  """Measures timeline metrics while performing smoothness action on
+  key mobile sites labeled with fast-path tag.
+  http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
+  test = thread_times.ThreadTimes
+  page_set = 'page_sets/key_mobile_sites.json'
+  options = {'page_label_filter' : 'fastpath'}
+
+class LegacyFastPathBenchmark(ThreadTimesFastPathMobileSites):
+  """Same as thread_times.fast_path_mobile_sites but with the old name."""
+  @classmethod
+  def GetName(cls):
+    return "fast_path.key_mobile_sites"