[telemetry] Make single-benchmark measurements protected and undiscoverable.

[telemetry] Make single-benchmark measurements protected and undiscoverable.

This will reduce the ambiguity/name collisions between benchmarks and measurements. Also some minor cleanups.


BUG=None.
TEST=None.

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

[dtu, 2013-09-12 23:40:37]

Not really decided if Dromaeo and BlinkPerf should also become protected and
move to the benchmarks/ folder.

[dtu, 2013-09-12 23:54:16]

On 2013/09/12 23:40:37, dtu wrote:
> Not really decided if Dromaeo and BlinkPerf should also become protected and
> move to the benchmarks/ folder.

Decided yes. Note that moving the bots to run_benchmark will have to come first.

[tonyg, 2013-09-22 19:57:46]

Hey Dave, Really sorry for missing this CL for so long. It is a great cleanup!

I'm assuming that after this change, this command will still work:
$ tools/perf/run_measurement sunspider

If so, this lgtm

[commit-bot: I haz the power, 2013-10-18 23:54:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtu@chromium.org/23455049/14001

[commit-bot: I haz the power, 2013-10-18 23:54:43]

Failed to apply patch for tools/perf/benchmarks/dromaeo.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file tools/perf/benchmarks/dromaeo.py
  Hunk #2 FAILED at 59.
  1 out of 2 hunks FAILED -- saving rejects to file
tools/perf/benchmarks/dromaeo.py.rej

Patch:       tools/perf/benchmarks/dromaeo.py
Index: tools/perf/benchmarks/dromaeo.py
diff --git a/tools/perf/benchmarks/dromaeo.py b/tools/perf/benchmarks/dromaeo.py
index
2a8222cee08e1e93413e4dc62146aedc7638b9fe..56954e4131f60cbfb5d9de62f17db8bf9ef23cf3
100644
--- a/tools/perf/benchmarks/dromaeo.py
+++ b/tools/perf/benchmarks/dromaeo.py
@@ -6,14 +6,38 @@ import os
 
 from telemetry import test
 from telemetry.core import util
+from telemetry.page import page_measurement
 from telemetry.page import page_set
 
-from measurements import dromaeo
 
+class _DromaeoMeasurement(page_measurement.PageMeasurement):
+  def MeasurePage(self, page, tab, results):
+    js_is_done = 'window.document.cookie.indexOf("__done=1") >= 0'
+    def _IsDone():
+      return bool(tab.EvaluateJavaScript(js_is_done))
+    util.WaitFor(_IsDone, 600, poll_interval=5)
 
-class DromaeoBenchmark(test.Test):
+    js_get_results = 'JSON.stringify(window.automation.GetResults())'
+    print js_get_results
+    score = eval(tab.EvaluateJavaScript(js_get_results))
+
+    def Escape(k):
+      chars = [' ', '-', '/', '(', ')', '*']
+      for c in chars:
+        k = k.replace(c, '_')
+      return k
+
+    suffix = page.url[page.url.index('?') + 1 : page.url.index('&')]
+    for k, v in score.iteritems():
+      data_type = 'unimportant'
+      if k == suffix:
+        data_type = 'default'
+      results.Add(Escape(k), 'runs/s', v, data_type=data_type)
+
+
+class _DromaeoBenchmark(test.Test):
   """A base class for Dromaeo benchmarks."""
-  test = dromaeo.Dromaeo
+  test = _DromaeoMeasurement
 
   def CreatePageSet(self, options):
     """Makes a PageSet for Dromaeo benchmarks."""
@@ -35,85 +59,85 @@ class DromaeoBenchmark(test.Test):
     return page_set.PageSet.FromDict(page_set_dict, dromaeo_dir)
 
 
-class DromaeoDomCoreAttr(DromaeoBenchmark):
+class DromaeoDomCoreAttr(_DromaeoBenchmark):
   """Dromaeo DOMCore attr JavaScript benchmark."""
   tag = 'domcoreattr'
   query_param = 'dom-attr'
 
 
-class DromaeoDomCoreModify(DromaeoBenchmark):
+class DromaeoDomCoreModify(_DromaeoBenchmark):
   """Dromaeo DOMCore modify JavaScript benchmark."""
   tag = 'domcoremodify'
   query_param = 'dom-modify'
 
 
-class DromaeoDomCoreQuery(DromaeoBenchmark):
+class DromaeoDomCoreQuery(_DromaeoBenchmark):
   """Dromaeo DOMCore query JavaScript benchmark."""
   tag = 'domcorequery'
   query_param = 'dom-query'
 
 
-class DromaeoDomCoreTraverse(DromaeoBenchmark):
+class DromaeoDomCoreTraverse(_DromaeoBenchmark):
   """Dromaeo DOMCore traverse JavaScript benchmark."""
   tag = 'domcoretraverse'
   query_param = 'dom-traverse'
 
 
-class DromaeoJslibAttrJquery(DromaeoBenchmark):
+class DromaeoJslibAttrJquery(_DromaeoBenchmark):
   """Dromaeo JSLib attr jquery JavaScript benchmark"""
   tag = 'jslibattrjquery'
   query_param = 'jslib-attr-query'
 
 
-class DromaeoJslibAttrPrototype(DromaeoBenchmark):
+class DromaeoJslibAttrPrototype(_DromaeoBenchmark):
   """Dromaeo JSLib attr prototype JavaScript benchmark"""
   tag = 'jslibattrprototype'
   query_param = 'jslib-attr-prototype'
 
 
-class DromaeoJslibEventJquery(DromaeoBenchmark):
+class DromaeoJslibEventJquery(_DromaeoBenchmark):
   """Dromaeo JSLib event jquery JavaScript benchmark"""
   tag = 'jslibeventjquery'
   query_param = 'jslib-event-jquery'
 
 
-class DromaeoJslibEventPrototype(DromaeoBenchmark):
+class DromaeoJslibEventPrototype(_DromaeoBenchmark):
   """Dromaeo JSLib event prototype JavaScript benchmark"""
   tag = 'jslibeventprototype'
   query_param = 'jslib-event-prototype'
 
 
-class DromaeoJslibModifyJquery(DromaeoBenchmark):
+class DromaeoJslibModifyJquery(_DromaeoBenchmark):
   """Dromaeo JSLib modify jquery JavaScript benchmark"""
   tag = 'jslibmodifyjquery'
   query_param = 'jslib-modify-jquery'
 
 
-class DromaeoJslibModifyPrototype(DromaeoBenchmark):
+class DromaeoJslibModifyPrototype(_DromaeoBenchmark):
   """Dromaeo JSLib modify prototype JavaScript benchmark"""
   tag = 'jslibmodifyprototype'
   query_param = 'jslib-modify-prototype'
 
 
-class DromaeoJslibStyleJquery(DromaeoBenchmark):
+class DromaeoJslibStyleJquery(_DromaeoBenchmark):
   """Dromaeo JSLib style jquery JavaScript benchmark"""
   tag = 'jslibstylejquery'
   query_param = 'jslib-style-jquery'
 
 
-class DromaeoJslibStylePrototype(DromaeoBenchmark):
+class DromaeoJslibStylePrototype(_DromaeoBenchmark):
   """Dromaeo JSLib style prototype JavaScript benchmark"""
   tag = 'jslibstyleprototype'
   query_param = 'jslib-style-prototype'
 
 
-class DromaeoJslibTraverseJquery(DromaeoBenchmark):
+class DromaeoJslibTraverseJquery(_DromaeoBenchmark):
   """Dromaeo JSLib traverse jquery JavaScript benchmark"""
   tag = 'jslibtraversejquery'
   query_param = 'jslib-traverse-jquery'
 
 
-class DromaeoJslibTraversePrototype(DromaeoBenchmark):
+class DromaeoJslibTraversePrototype(_DromaeoBenchmark):
   """Dromaeo JSLib traverse prototype JavaScript benchmark"""
   tag = 'jslibtraverseprototype'
   query_param = 'jslib-traverse-prototype'

[dtu, 2013-10-29 22:18:08]

Now that the run_benchmark/renaming dust has settled, I'm going to land this
change.

[commit-bot: I haz the power, 2013-10-29 22:19:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtu@chromium.org/23455049/333001

[commit-bot: I haz the power, 2013-10-30 01:58:36]

Retried try job too often on mac_rel for step(s) telemetry_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-10-30 21:07:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dtu@chromium.org/23455049/543001

[commit-bot: I haz the power, 2013-10-31 03:58:49]

Change committed as 231981