Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: tools/perf/benchmarks/dromaeo.py

Issue 2719853003: [Telemetry refactor] Drop "2" from method calls to JS API (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/perf/benchmarks/blink_perf.py ('k') | tools/perf/benchmarks/indexeddb_perf.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/perf/benchmarks/dromaeo.py
diff --git a/tools/perf/benchmarks/dromaeo.py b/tools/perf/benchmarks/dromaeo.py
index 22289d09bf7d02d6daab0452488ba14310b3125b..2eaaca35a69064e26cb58620c879e954233c7ed7 100644
--- a/tools/perf/benchmarks/dromaeo.py
+++ b/tools/perf/benchmarks/dromaeo.py
@@ -33,14 +33,14 @@ class _DromaeoMeasurement(legacy_page_test.LegacyPageTest):
self._power_metric.Start(page, tab)
def ValidateAndMeasurePage(self, page, tab, results):
- tab.WaitForJavaScriptCondition2(
+ tab.WaitForJavaScriptCondition(
'window.document.getElementById("pause") &&' +
'window.document.getElementById("pause").value == "Run"',
timeout=120)
# Start spying on POST request that will report benchmark results, and
# intercept result data.
- tab.ExecuteJavaScript2("""
+ tab.ExecuteJavaScript("""
(function() {
var real_jquery_ajax_ = window.jQuery;
window.results_ = "";
@@ -55,14 +55,14 @@ class _DromaeoMeasurement(legacy_page_test.LegacyPageTest):
};
})();""")
# Starts benchmark.
- tab.ExecuteJavaScript2('window.document.getElementById("pause").click();')
+ tab.ExecuteJavaScript('window.document.getElementById("pause").click();')
- tab.WaitForJavaScriptCondition2('!!window.results_', timeout=600)
+ tab.WaitForJavaScriptCondition('!!window.results_', timeout=600)
self._power_metric.Stop(page, tab)
self._power_metric.AddResults(tab, results)
- score = json.loads(tab.EvaluateJavaScript2('window.results_ || "[]"'))
+ score = json.loads(tab.EvaluateJavaScript('window.results_ || "[]"'))
def Escape(k):
chars = [' ', '.', '-', '/', '(', ')', '*']
« no previous file with comments | « tools/perf/benchmarks/blink_perf.py ('k') | tools/perf/benchmarks/indexeddb_perf.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698